diff --git a/hosts/PW05CH3L/configuration.nix b/hosts/PW05CH3L/configuration.nix
index f083bc9c..f915bfb2 100644
--- a/hosts/PW05CH3L/configuration.nix
+++ b/hosts/PW05CH3L/configuration.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../../modules/editor/nvim.nix
-    ../../modules/mixins/common.nix
+    ../../modules/mixins/common
     ../../modules/mixins/direnv.nix
     ../../modules/mixins/docker.nix
     ../../modules/mixins/fzf.nix
diff --git a/hosts/lemp11/configuration.nix b/hosts/lemp11/configuration.nix
index d4f214d4..6af2a7c6 100644
--- a/hosts/lemp11/configuration.nix
+++ b/hosts/lemp11/configuration.nix
@@ -7,7 +7,7 @@
     ./programs.nix
     ./services.nix
 
-    ../../modules/mixins/common.nix
+    ../../modules/mixins/common
     ../../modules/mixins/zsh
 
     ../../users/opdavies
diff --git a/hosts/nixedo/configuration.nix b/hosts/nixedo/configuration.nix
index e7c1f31e..d3de3a07 100644
--- a/hosts/nixedo/configuration.nix
+++ b/hosts/nixedo/configuration.nix
@@ -10,7 +10,7 @@
     ./secrets.nix
     ./services.nix
 
-    ../../modules/mixins/common.nix
+    ../../modules/mixins/common
     ../../modules/mixins/docker.nix
     ../../modules/mixins/zsh
 
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 764c5c4f..809ba3ca 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -9,7 +9,7 @@
 
     ../../modules/editor/nvim.nix
     ../../modules/mixins/bluetooth.nix
-    ../../modules/mixins/common.nix
+    ../../modules/mixins/common
     ../../modules/mixins/direnv.nix
     ../../modules/mixins/docker.nix
     ../../modules/mixins/firefox.nix
diff --git a/hosts/t490/configuration.nix b/hosts/t490/configuration.nix
index ca29602a..9b947f7a 100644
--- a/hosts/t490/configuration.nix
+++ b/hosts/t490/configuration.nix
@@ -9,7 +9,7 @@
     ./services
     ./users.nix
 
-    ../../modules/mixins/common.nix
+    ../../modules/mixins/common
 
     ../../users/opdavies
   ];
diff --git a/modules/mixins/common.nix b/modules/mixins/common/default.nix
similarity index 96%
rename from modules/mixins/common.nix
rename to modules/mixins/common/default.nix
index 133ef504..407c327b 100644
--- a/modules/mixins/common.nix
+++ b/modules/mixins/common/default.nix
@@ -65,7 +65,7 @@
     useGlobalPkgs = true;
     useUserPackages = true;
 
-    users."${username}" = import "${self}/home/${username}";
+    users."${username}" = import ./home.nix;
   };
 
   nixpkgs = {
diff --git a/home/opdavies/default.nix b/modules/mixins/common/home.nix
similarity index 100%
rename from home/opdavies/default.nix
rename to modules/mixins/common/home.nix