diff --git a/hosts/pinwheel/configuration.nix b/hosts/pinwheel/configuration.nix
index 1ab8811..fa9a498 100644
--- a/hosts/pinwheel/configuration.nix
+++ b/hosts/pinwheel/configuration.nix
@@ -11,6 +11,7 @@
       ./modules/age
       ./modules/ssh
       ./modules/syncthing
+      ./modules/firefox
     ];
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
diff --git a/hosts/pinwheel/home.nix b/hosts/pinwheel/home.nix
index a1bd6ef..7dcd2ae 100644
--- a/hosts/pinwheel/home.nix
+++ b/hosts/pinwheel/home.nix
@@ -4,10 +4,6 @@
 
   home.username = "alex";
   home.homeDirectory = "/home/alex";
-
-  imports = [
-    ./../../modules/firefox
-  ];
  
   home.packages = with pkgs; [
     vim
diff --git a/modules/firefox/default.nix b/hosts/pinwheel/modules/firefox/default.nix
similarity index 71%
rename from modules/firefox/default.nix
rename to hosts/pinwheel/modules/firefox/default.nix
index d60f338..e641315 100644
--- a/modules/firefox/default.nix
+++ b/hosts/pinwheel/modules/firefox/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ home-manager, pkgs, ... }:
 let
   wrapped = pkgs.wrapFirefox pkgs.firefox-devedition-unwrapped {
     extraPolicies = {
@@ -34,23 +34,26 @@ let
   };
 in
 {
-  programs.firefox = {
-    enable = true;
+  home-manager.users.alex = {
+    programs.firefox = {
+      enable = true;
 
-    package = wrapped;
+      package = wrapped;
 
-    profiles = {
-      alex = {
-        id = 0;
-        name = "alex";
-      };
+      profiles = {
+        alex = {
+          id = 0;
+          name = "alex";
+        };
 
-      work = {
-        id = 1;
-        name = "work";
+        work = {
+          id = 1;
+          name = "work";
+        };
       };
     };
-  };
 
-  home.packages = [ ff ];
+    home.packages = [ ff ];
+  };
+  
 }