diff --git a/flake.lock b/flake.lock
index e2097469..9b1a2a36 100644
--- a/flake.lock
+++ b/flake.lock
@@ -97,11 +97,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736598355,
-        "narHash": "sha256-MQqhWOfTvan3tAUI0h3IIQhCG9FBiI2/zDjQPKSkeH0=",
+        "lastModified": 1736895040,
+        "narHash": "sha256-04UHIc5EG7E3f7i6Q7HKpWixaisvcP2z9D8sWBNv/3c=",
         "owner": "tgirlcloud",
         "repo": "beapkgs",
-        "rev": "20d78bc479c10a1d79cd66e36fbb2717f2606efe",
+        "rev": "6d53369b1d5c0d752e5a413f1774797eb3fbe315",
         "type": "github"
       },
       "original": {
diff --git a/modules/base/nix/nh.nix b/modules/base/nix/nh.nix
index 239a11bf..fe098c4c 100644
--- a/modules/base/nix/nh.nix
+++ b/modules/base/nix/nh.nix
@@ -1,7 +1,13 @@
-{ config, ... }:
+{
+  lib,
+  config,
+  inputs',
+  ...
+}:
 {
   programs.nh = {
     enable = true;
+    package = inputs'.beapkgs.packages.nh;
 
     clean = {
       enable = !config.nix.gc.automatic;
@@ -12,5 +18,11 @@
   # WARNING: this leaves you without commands like `nixos-rebuild` which you don't
   # really need, you may consider enabling nh and using `nh os switch` instead
   # which is actually a really good alternative to using this
-  system.disableInstallerTools = config.programs.nh.enable;
+  system =
+    {
+      disableInstallerTools = config.programs.nh.enable;
+    }
+    // lib.attrsets.optionalAttrs (config.system ? tools) {
+      tools.nixos-version.enable = true;
+    };
 }