diff --git a/home/accounts.nix b/home-manager/modules/profiles/user/willem/accounts.nix
similarity index 100%
rename from home/accounts.nix
rename to home-manager/modules/profiles/user/willem/accounts.nix
diff --git a/home/darwin.nix b/home-manager/modules/profiles/user/willem/darwin.nix
similarity index 92%
rename from home/darwin.nix
rename to home-manager/modules/profiles/user/willem/darwin.nix
index 03f0b85..1c7ddb3 100644
--- a/home/darwin.nix
+++ b/home-manager/modules/profiles/user/willem/darwin.nix
@@ -43,8 +43,8 @@ in
     pinentry = "pinentry-mac";
   } // lib.attrsets.mapAttrs (name: value: "open -a '" + value + "'") appCommands);
 
-  programs.firefox.package = mkIf stdenv.isDarwin pkgs.firefox-mac;
-  programs.chromium.package = mkIf stdenv.isDarwin pkgs.chromium-mac;
+  programs.firefox.package = mkIf stdenv.isDarwin (pkgs.callPackage ../overlays/firefox-mac.nix { inherit pkgs; });
+  programs.chromium.package = mkIf stdenv.isDarwin (pkgs.callPackage ../overlays/chromium-mac.nix { inherit pkgs; });
 
   targets.darwin = mkIf stdenv.isDarwin {
     defaults = {
diff --git a/home/default.nix b/home-manager/modules/profiles/user/willem/default.nix
similarity index 97%
rename from home/default.nix
rename to home-manager/modules/profiles/user/willem/default.nix
index 80464d4..ef1d146 100644
--- a/home/default.nix
+++ b/home-manager/modules/profiles/user/willem/default.nix
@@ -24,6 +24,7 @@ rec {
 
       '';
     };
+    homeDirectory = "/Users/willem";
     keyboard = {
       layout = "us";
       variant = "colemak";
diff --git a/home/emacs.nix b/home-manager/modules/profiles/user/willem/emacs.nix
similarity index 100%
rename from home/emacs.nix
rename to home-manager/modules/profiles/user/willem/emacs.nix
diff --git a/home/feeds.nix b/home-manager/modules/profiles/user/willem/feeds.nix
similarity index 100%
rename from home/feeds.nix
rename to home-manager/modules/profiles/user/willem/feeds.nix
diff --git a/home/finder.nix b/home-manager/modules/profiles/user/willem/finder.nix
similarity index 100%
rename from home/finder.nix
rename to home-manager/modules/profiles/user/willem/finder.nix
diff --git a/home/firefox.nix b/home-manager/modules/profiles/user/willem/firefox.nix
similarity index 100%
rename from home/firefox.nix
rename to home-manager/modules/profiles/user/willem/firefox.nix
diff --git a/home/iterm2.nix b/home-manager/modules/profiles/user/willem/iterm2.nix
similarity index 100%
rename from home/iterm2.nix
rename to home-manager/modules/profiles/user/willem/iterm2.nix
diff --git a/home/launchd.nix b/home-manager/modules/profiles/user/willem/launchd.nix
similarity index 100%
rename from home/launchd.nix
rename to home-manager/modules/profiles/user/willem/launchd.nix
diff --git a/home/packages.nix b/home-manager/modules/profiles/user/willem/packages.nix
similarity index 100%
rename from home/packages.nix
rename to home-manager/modules/profiles/user/willem/packages.nix
diff --git a/home/programs.nix b/home-manager/modules/profiles/user/willem/programs.nix
similarity index 100%
rename from home/programs.nix
rename to home-manager/modules/profiles/user/willem/programs.nix