diff --git a/modules/machine.nix b/modules/machine.nix
index 41924bb..cd8b16b 100644
--- a/modules/machine.nix
+++ b/modules/machine.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [ ./common.nix ];
diff --git a/modules/nixos/configs/nix.nix b/modules/nixos/configs/nix.nix
index 47a1b25..1768fee 100644
--- a/modules/nixos/configs/nix.nix
+++ b/modules/nixos/configs/nix.nix
@@ -1,4 +1,4 @@
-{ lib, inputs, config, ... }:
+{ lib, inputs, config, pkgs, ... }:
 
 let
   inherit (builtins) elem;
@@ -24,6 +24,9 @@ in
   };
 
   config = {
+    environment.systemPackages =
+      lib.optional config.system.tools.nixos-option.enable pkgs.unstable.nixos-option;
+
     nixpkgs.config.allowUnfreePredicate = lib.mkIf
       (cfg.allowUnfreePackages != [ ])
       (pkg: elem (lib.getName pkg) cfg.allowUnfreePackages);