diff --git a/.config/nix/systems/darwin/default.nix b/.config/nix/systems/darwin/default.nix
index daff59a..594ec39 100644
--- a/.config/nix/systems/darwin/default.nix
+++ b/.config/nix/systems/darwin/default.nix
@@ -1,6 +1,8 @@
 { inputs, nixpkgs, nix-darwin, home-manager, vars, ... }:
 
 let
+  mkCommon = import ../mkCommon.nix;
+
   disablePyChecks = pkg: pkg.overridePythonAttrs (old: {
     doCheck = false;
     doInstallCheck = false;
@@ -25,7 +27,6 @@ let
       config.allowUnfree = true;
     };
   };
-  mkCommon = import ../mkCommon.nix;
 in
 {
   # Host list
@@ -56,11 +57,11 @@ in
   MacBookProM1 =
     let
       inherit (systemConfig "aarch64-darwin") system pkgs;
-      vars.common = (mkCommon pkgs);
+      common = (mkCommon pkgs);
     in
     nix-darwin.lib.darwinSystem {
       inherit system;
-      specialArgs = { inherit inputs pkgs home-manager vars; };
+      specialArgs = { inherit inputs pkgs home-manager vars common; };
       modules = [
         ./configuration.nix
         home-manager.darwinModules.home-manager
diff --git a/.config/nix/systems/nix/default.nix b/.config/nix/systems/nix/default.nix
index 170c869..671fa1b 100644
--- a/.config/nix/systems/nix/default.nix
+++ b/.config/nix/systems/nix/default.nix
@@ -1,6 +1,8 @@
 { inputs, nixpkgs, system-manager, home-manager, vars, ... }:
 
 let
+  mkCommon = import ../mkCommon.nix;
+
   disablePyChecks = pkg: pkg.overridePythonAttrs (old: {
     doCheck = false;
     doInstallCheck = false;
@@ -25,7 +27,6 @@ let
       config.allowUnfree = true;
     };
   };
-  mkCommon = import ../mkCommon.nix;
 in
 {
   "potato" =