diff --git a/.envrc b/.envrc
index 3550a30..6cb4a53 100644
--- a/.envrc
+++ b/.envrc
@@ -1 +1,2 @@
 use flake
+watch_file nilla.nix
diff --git a/flake.lock b/flake.lock
index 14086e8..2b4bac2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -164,26 +164,6 @@
         "type": "github"
       }
     },
-    "firefox-darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743383039,
-        "narHash": "sha256-Palj4EeFRS3tLl2aK0FgE01SBWRbqD4vKE+SNBJaYo4=",
-        "owner": "bandithedoge",
-        "repo": "nixpkgs-firefox-darwin",
-        "rev": "96f1d9e12f0efbbc4cea47c0a06a1667ed90e5f8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "bandithedoge",
-        "repo": "nixpkgs-firefox-darwin",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -393,6 +373,22 @@
         "type": "gitlab"
       }
     },
+    "nh": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1746032033,
+        "narHash": "sha256-BCD0tfDNlQHFM75THRtXM3GegMg/KbREsYllg7Az9ao=",
+        "owner": "nix-community",
+        "repo": "nh",
+        "rev": "894bb7ebf3adb58f76d1f7d9f6b33f58758d40f0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nh",
+        "type": "github"
+      }
+    },
     "niko-nur": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -516,12 +512,12 @@
         "crane": "crane",
         "darwin": "darwin",
         "disko": "disko",
-        "firefox-darwin": "firefox-darwin",
         "helix": "helix",
         "home-manager": "home-manager",
         "lix": "lix",
         "lix-module": "lix-module",
         "mailserver": "mailserver",
+        "nh": "nh",
         "niko-nur": "niko-nur",
         "nilla": "nilla",
         "nixpkgs": "nixpkgs_2",
diff --git a/flake.nix b/flake.nix
index 4df88d5..9786d64 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,10 +47,6 @@
       url = "gitlab:famedly/conduit?ref=next";
       flake = false;
     };
-    firefox-darwin = {
-      url = "github:bandithedoge/nixpkgs-firefox-darwin";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     niko-nur = {
       url = "github:nrabulinski/nur-packages";
     };
@@ -91,5 +87,9 @@
       url = "github:nilla-nix/nilla";
       flake = false;
     };
+    nh = {
+      url = "github:nix-community/nh";
+      flake = false;
+    };
   };
 }
diff --git a/modules/home/default.nix b/modules/home/default.nix
index f11fcaa..cd62227 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -1,7 +1,6 @@
 # TODO: Make this module not rely on OS config being present
 {
   osConfig,
-  pkgs,
   lib,
   inputs',
   machineName,
@@ -59,7 +58,6 @@ in
 
   home.packages = [
     inputs'.settei.packages.base-packages
-    pkgs.nh
   ];
 
   home.sessionVariables.EDITOR = "hx";
diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix
index 825d69c..068c82c 100644
--- a/modules/home/desktop/default.nix
+++ b/modules/home/desktop/default.nix
@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  inputs,
   inputs',
   ...
 }:
@@ -29,11 +28,7 @@
 
     programs.firefox = {
       enable = true;
-      package =
-        let
-          firefox-pkgs = pkgs.extend inputs.firefox-darwin.overlay;
-        in
-        lib.mkIf pkgs.stdenv.isDarwin firefox-pkgs.firefox-bin;
+      package = lib.mkIf pkgs.stdenv.isDarwin pkgs.firefox-unwrapped;
     };
 
     programs.qutebrowser = {
diff --git a/nilla.nix b/nilla.nix
index 7f3ef71..3a1a09e 100644
--- a/nilla.nix
+++ b/nilla.nix
@@ -53,11 +53,11 @@
           symlinkJoin {
             name = "settei-base";
             paths = with (getPkgs system); [
-              # TODO: wrappers
               helix
               fish
               git-commit-last
               git-fixup
+              nh
             ];
           }
         );
@@ -127,7 +127,7 @@
           packages = [
             config.packages.agenix.result.${system}
             config.packages.attic-client.result.${system}
-            nh
+            config.packages.nh.result.${system}
           ];
         };
     };
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 4e5cd0c..3efdd36 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -69,4 +69,10 @@ in
     builder = "custom-load";
     package = { system }: atticPkgs.${system}.attic-server;
   };
+
+  config.packages.nh = {
+    inherit systems builder;
+    package = import "${inputs.nh}/package.nix";
+    settings.args.rev = inputs.nh.shortRev;
+  };
 }