diff --git a/home/modules/baseline/default.nix b/home/modules/baseline/default.nix
index 749fd47..18fdb03 100644
--- a/home/modules/baseline/default.nix
+++ b/home/modules/baseline/default.nix
@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ../../../modules/nix-conf.nix
     ./ansible.nix
     ./bash.nix
     ./direnv.nix
diff --git a/modules/baseline.nix b/modules/baseline.nix
index 54915b4..38fba78 100644
--- a/modules/baseline.nix
+++ b/modules/baseline.nix
@@ -15,63 +15,9 @@ let
       [ ];
 in
 {
-  # Enable flakes
-  nix = {
-    gc = {
-      automatic = true;
-      # Scheduling of them is different in nixos vs nix-darwin, so check for
-      # the extra details there
-      options = "--delete-older-than 30d";
-    };
-
-    settings = {
-      experimental-features = "nix-command flakes";
-      keep-outputs = true;
-      keep-derivations = true;
-      min-free = (toString (1024 * 1024 * 1024));
-      max-free = (toString (5 * 1024 * 1024 * 1024));
-      trusted-users = [
-        "greg"
-        "gregory.hellings"
-      ]; # For home and for work machines
-      substituters = [
-        "http://nas.home:9000/binary-cache/"
-        "https://cache.garnix.io"
-        "https://ai.cachix.org"
-        "https://nixpkgs-python.cachix.org"
-        "https://greg-hellings.cachix.org"
-        "https://nix-community.cachix.org"
-      ];
-      trusted-public-keys = [
-        "nix.home:0qWYHn3gGllXChhAaaxKlNZtRy6yG/XJs1RFSqV3nW8="
-        "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
-        "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="
-        "nixpkgs-python.cachix.org-1:hxjI7pFxTyuTHn2NkvWCrAUcNZLNS3ZAvfYNuYifcEU="
-        "greg-hellings.cachix.org-1:y01Jl/L5evlhxdnUW6n56AiI1k8g1wxWhTxJCe7XSco="
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      ];
-    };
-
-    buildMachines = (
-      lib.map (host: {
-        hostName = "${host}-builder";
-        system = "x86_64-linux";
-        protocol = "ssh-ng";
-        maxJobs = 12;
-        speedFactor = 2;
-        supportedFeatures = [
-          "nixos-test"
-          "benchmark"
-          "big-parallel"
-          "kvm"
-        ];
-      }) (lib.filter (x: x != config.networking.hostName) builderHosts)
-    );
-    distributedBuilds = true;
-    extraOptions = ''
-      builders-use-substitutes = true
-    '';
-  };
+  imports = [
+    ./nix-conf.nix
+  ];
 
   programs.ssh = {
     knownHosts = {
@@ -156,11 +102,6 @@ in
     );
   };
 
-  nixpkgs.config = {
-    allowUnfree = true;
-    permittedInsecurePackages = [ "jitsi-meet-1.0.8043" ];
-  };
-
   # Base packages that need to be in all my hosts
   environment.systemPackages = with pkgs; [
     agenix
diff --git a/modules/nix-conf.nix b/modules/nix-conf.nix
new file mode 100644
index 0000000..8d48262
--- /dev/null
+++ b/modules/nix-conf.nix
@@ -0,0 +1,47 @@
+{ pkgs, ... }:
+
+{
+  nix = {
+    gc = {
+      automatic = true;
+      # Scheduling of them is different in nixos vs nix-darwin, so check for
+      # the extra details there
+      options = "--delete-older-than 30d";
+    };
+
+    package = pkgs.nixStable;
+
+    settings = {
+      experimental-features = "nix-command flakes";
+      keep-outputs = true;
+      keep-derivations = true;
+      min-free = (toString (1024 * 1024 * 1024));
+      max-free = (toString (5 * 1024 * 1024 * 1024));
+      trusted-users = [
+        "greg"
+        "gregory.hellings"
+      ]; # For home and for work machines
+      substituters = [
+        "http://nas.home:9000/binary-cache/"
+        "https://cache.garnix.io"
+        "https://ai.cachix.org"
+        "https://nixpkgs-python.cachix.org"
+        "https://greg-hellings.cachix.org"
+        "https://nix-community.cachix.org"
+      ];
+      trusted-public-keys = [
+        "nix.home:0qWYHn3gGllXChhAaaxKlNZtRy6yG/XJs1RFSqV3nW8="
+        "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+        "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="
+        "nixpkgs-python.cachix.org-1:hxjI7pFxTyuTHn2NkvWCrAUcNZLNS3ZAvfYNuYifcEU="
+        "greg-hellings.cachix.org-1:y01Jl/L5evlhxdnUW6n56AiI1k8g1wxWhTxJCe7XSco="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      ];
+    };
+  };
+
+  nixpkgs.config = {
+    allowUnfree = true;
+    permittedInsecurePackages = [ "jitsi-meet-1.0.8043" ];
+  };
+}