diff --git a/home/common/default.nix b/home-manager/common/default.nix
similarity index 100%
rename from home/common/default.nix
rename to home-manager/common/default.nix
diff --git a/home/opdavies/PW05CH3L.nix b/home-manager/opdavies/PW05CH3L.nix
similarity index 100%
rename from home/opdavies/PW05CH3L.nix
rename to home-manager/opdavies/PW05CH3L.nix
diff --git a/home/opdavies/lemp11.nix b/home-manager/opdavies/lemp11.nix
similarity index 100%
rename from home/opdavies/lemp11.nix
rename to home-manager/opdavies/lemp11.nix
diff --git a/home/opdavies/nixedo.nix b/home-manager/opdavies/nixedo.nix
similarity index 100%
rename from home/opdavies/nixedo.nix
rename to home-manager/opdavies/nixedo.nix
diff --git a/home/opdavies/nixedo/email-filters.nix b/home-manager/opdavies/nixedo/email-filters.nix
similarity index 100%
rename from home/opdavies/nixedo/email-filters.nix
rename to home-manager/opdavies/nixedo/email-filters.nix
diff --git a/home/opdavies/t480.nix b/home-manager/opdavies/t480.nix
similarity index 100%
rename from home/opdavies/t480.nix
rename to home-manager/opdavies/t480.nix
diff --git a/home/opdavies/t480/gammastep.nix b/home-manager/opdavies/t480/gammastep.nix
similarity index 100%
rename from home/opdavies/t480/gammastep.nix
rename to home-manager/opdavies/t480/gammastep.nix
diff --git a/home/opdavies/t490.nix b/home-manager/opdavies/t490.nix
similarity index 100%
rename from home/opdavies/t490.nix
rename to home-manager/opdavies/t490.nix
diff --git a/hosts/common/users/opdavies.nix b/hosts/common/users/opdavies.nix
index 556baaca..3842a813 100644
--- a/hosts/common/users/opdavies.nix
+++ b/hosts/common/users/opdavies.nix
@@ -1,7 +1,7 @@
-{ config, ... }:
+{ config, self, ... }:
 
 {
   users.users.opdavies = { };
 
-  home-manager.users.opdavies = import ../../../home/opdavies/${config.networking.hostName}.nix;
+  home-manager.users.opdavies = import "${self}/home-manager/opdavies/${config.networking.hostName}.nix";
 }