diff --git a/systems/darwin/ci.nix b/nix-darwin/ci.nix
similarity index 100%
rename from systems/darwin/ci.nix
rename to nix-darwin/ci.nix
diff --git a/systems/disko/trivial.nix b/nixos/disko/trivial.nix
similarity index 100%
rename from systems/disko/trivial.nix
rename to nixos/disko/trivial.nix
diff --git a/systems/disko/two-raids-on-two-disks.nix b/nixos/disko/two-raids-on-two-disks.nix
similarity index 100%
rename from systems/disko/two-raids-on-two-disks.nix
rename to nixos/disko/two-raids-on-two-disks.nix
diff --git a/systems/hetzner/nixos-container.nix b/nixos/nixos-container.nix
similarity index 100%
rename from systems/hetzner/nixos-container.nix
rename to nixos/nixos-container.nix
diff --git a/systems/darwin.nix b/systems/darwin.nix
index 48a0e4a..80a069c 100644
--- a/systems/darwin.nix
+++ b/systems/darwin.nix
@@ -4,7 +4,7 @@
 {
   imports = [
     flake.inputs.self.darwinModules.default
-    ./darwin/ci.nix
+    ../nix-darwin/ci.nix
   ];
 
   nixpkgs.hostPlatform = "aarch64-darwin";
diff --git a/systems/hetzner/ax41.nix b/systems/hetzner/ax41.nix
index 8eebc64..b330b1c 100644
--- a/systems/hetzner/ax41.nix
+++ b/systems/hetzner/ax41.nix
@@ -4,7 +4,7 @@
     flake.inputs.self.nixosModules.default # Defined in nixos/default.nix
     flake.inputs.sops-nix.nixosModules.sops
     flake.inputs.disko.nixosModules.disko
-    ./nixos-container.nix
+    ../../nixos/nixos-container.nix
     ../../nixos/server/harden
   ];
   system.stateVersion = "23.11";
@@ -50,7 +50,7 @@
     defaultGateway = "65.109.35.129"; # `ip route | grep default`
     nameservers = [ "8.8.8.8" ];
   };
-  disko.devices = import ../disko/two-raids-on-two-disks.nix {
+  disko.devices = import ../../nixos/disko/two-raids-on-two-disks.nix {
     inherit lib;
   };
 }
diff --git a/systems/linux-builder.nix b/systems/linux-builder.nix
index 379017e..c138324 100644
--- a/systems/linux-builder.nix
+++ b/systems/linux-builder.nix
@@ -32,7 +32,7 @@
       MAILADDR srid@srid.ca
     '';
   };
-  disko.devices = import ./disko/trivial.nix { device = "/dev/sda"; };
+  disko.devices = import ../nixos/disko/trivial.nix { device = "/dev/sda"; };
   networking = {
     hostName = "linux-builder";
     networkmanager.enable = true;