diff --git a/flake.nix b/flake.nix
index 8d22f0f..ce30709 100644
--- a/flake.nix
+++ b/flake.nix
@@ -211,7 +211,6 @@
         system = "armv7l-linux";
         specialArgs = {inherit inputs outputs;};
         modules = [
-          nix-index-database.nixosModules.nix-index
           # make the module declared by the linger flake available to our config
           #linger.nixosModules."armv7l-linux".default
           #pihole.nixosModules."armv7l-linux".default
diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix
index a62a6f1..2baa9c0 100644
--- a/nixos/desktop/default.nix
+++ b/nixos/desktop/default.nix
@@ -27,7 +27,7 @@
   };
 
   # Allow executing of anything on the system with a , eg: , python executes python from the nix store even if not in $PATH currently
-  programs.command-not-found.enable = false;
+  programs.command-not-found.enable = lib.mkForce false;
   programs.nix-index.enable = true;
   programs.nix-index-database.comma.enable = true;
 
diff --git a/nixos/hosts/iso/configuration.nix b/nixos/hosts/iso/configuration.nix
index f8efbdb..2585dc7 100644
--- a/nixos/hosts/iso/configuration.nix
+++ b/nixos/hosts/iso/configuration.nix
@@ -19,6 +19,10 @@
     ../../shared
   ];
 
+  programs.command-not-found.enable = lib.mkForce false;
+  programs.nix-index.enable = true;
+  programs.nix-index-database.comma.enable = true;
+
   boot.tmp.cleanOnBoot = true;
   zramSwap.enable = false;
   networking.domain = "";