diff --git a/lib/builders/modules/nix-commons/default.nix b/lib/builders/modules/nix-commons/default.nix
index 624e2e2b..d5426ca0 100644
--- a/lib/builders/modules/nix-commons/default.nix
+++ b/lib/builders/modules/nix-commons/default.nix
@@ -1,11 +1,5 @@
 { lib, inputs, pkgs, ... }:
 
-let
-
-  nixSubstituters = import ../nix-commons/substituters.nix;
-
-in
-
 {
   nix = {
     package = pkgs.nix;
@@ -13,10 +7,5 @@ in
       nixpkgs.flake = inputs.nixpkgs;
       nix-config.flake = inputs.self;
     };
-    settings = {
-      auto-optimise-store = lib.mkDefault true;
-      experimental-features = [ "nix-command" "flakes" ];
-      log-lines = 30;
-    } // nixSubstituters;
   };
 }
diff --git a/lib/builders/modules/nix-nod/default.nix b/lib/builders/modules/nix-nod/default.nix
index ca0154f4..3895b0e7 100644
--- a/lib/builders/modules/nix-nod/default.nix
+++ b/lib/builders/modules/nix-nod/default.nix
@@ -9,9 +9,8 @@ in
 
 lib.recursiveUpdate nixCommons {
   nix = {
+    inherit (nixSubstituters) substituters;
+    trustedPublicKeys = nixSubstituters.trusted-public-keys;
     nixPath = [ "nixpkgs=flake:nixpkgs" ];
-    settings = {
-      auto-optimise-store = false;
-    };
-  } // nixSubstituters;
+  };
 }
diff --git a/lib/builders/modules/nix/default.nix b/lib/builders/modules/nix/default.nix
index aba9c214..d0560cb0 100644
--- a/lib/builders/modules/nix/default.nix
+++ b/lib/builders/modules/nix/default.nix
@@ -3,6 +3,7 @@
 let
 
   nixCommons = import ../nix-commons args;
+  nixSubstituters = import ../nix-commons/substituters.nix;
 
 in
 
@@ -11,7 +12,10 @@ lib.recursiveUpdate nixCommons {
     nixPath = [ "nixpkgs=flake:nixpkgs" ];
     settings = {
       allowed-users = builtins.attrNames config.users.users;
-    };
+      auto-optimise-store = lib.mkDefault true;
+      experimental-features = [ "nix-command" "flakes" ];
+      log-lines = 30;
+    } // nixSubstituters;
   };
 
   system.activationScripts.diff = {