diff --git a/flake.nix b/flake.nix
index aab4e08..52bcf08 100644
--- a/flake.nix
+++ b/flake.nix
@@ -73,7 +73,7 @@
         # Configuration for a NixOS VM (running on my Mac)
         nixosConfigurations.linux-builder =
           self.nixos-flake.lib.mkLinuxSystem
-            ./systems/linux-builder.nix;
+            ./systems/linux-builder;
       };
 
       perSystem = { self', system, pkgs, lib, config, inputs', ... }: {
diff --git a/systems/linux-builder.nix b/systems/linux-builder/default.nix
similarity index 72%
rename from systems/linux-builder.nix
rename to systems/linux-builder/default.nix
index c138324..b91ee77 100644
--- a/systems/linux-builder.nix
+++ b/systems/linux-builder/default.nix
@@ -11,14 +11,12 @@
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
     flake.inputs.disko.nixosModules.disko
-    ../nixos/self/primary-as-admin.nix
-    ../nixos/server/harden/basics.nix
-    # Parallels VM support
-    {
-      hardware.parallels.enable = true;
-      nixpkgs.config.allowUnfree = true; # for parallels
-      services.ntp.enable = true; # Accurate time in Parallels VM?
-    }
+    ../../nixos/self/primary-as-admin.nix
+    ../../nixos/server/harden/basics.nix
+    ../../nixos/current-location.nix
+    ./parallels-vm.nix
+    # Dev
+    ./dev.nix
   ];
 
   # Basics
@@ -32,12 +30,11 @@
       MAILADDR srid@srid.ca
     '';
   };
-  disko.devices = import ../nixos/disko/trivial.nix { device = "/dev/sda"; };
+  disko.devices = import ../../nixos/disko/trivial.nix { device = "/dev/sda"; };
   networking = {
     hostName = "linux-builder";
     networkmanager.enable = true;
   };
-  time.timeZone = "America/New_York";
 
   # Distributed Builder
   nixpkgs.hostPlatform = "aarch64-linux";
@@ -47,5 +44,4 @@
     # macos /etc/ssh/ssh_host_ed25519_key.pub
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOPGfskkyhM0wefy0Sex2t5GENEHTIZAWrb9LzRN0R9x"
   ];
-  nix.settings.trusted-users = [ "root" flake.config.people.myself ];
 }
diff --git a/systems/linux-builder/dev.nix b/systems/linux-builder/dev.nix
new file mode 100644
index 0000000..d41862c
--- /dev/null
+++ b/systems/linux-builder/dev.nix
@@ -0,0 +1,10 @@
+# Stuff I need for development (not required for CI per se)
+{ flake, ... }: {
+  imports = [
+    flake.inputs.self.nixosModules.home-manager
+    flake.inputs.self.nixosModules.my-home
+    ../../nixos/nix.nix
+  ];
+
+  virtualisation.docker.enable = true;
+}
diff --git a/systems/linux-builder/parallels-vm.nix b/systems/linux-builder/parallels-vm.nix
new file mode 100644
index 0000000..a602598
--- /dev/null
+++ b/systems/linux-builder/parallels-vm.nix
@@ -0,0 +1,6 @@
+# Parallels VM support
+{
+  hardware.parallels.enable = true;
+  nixpkgs.config.allowUnfree = true; # for parallels
+  services.ntp.enable = true; # Accurate time in Parallels VM?
+}