diff --git a/nix-os/core.nix b/nix-os/core.nix
index bb6ca15..30d4c7e 100644
--- a/nix-os/core.nix
+++ b/nix-os/core.nix
@@ -82,6 +82,14 @@ in
   # Use nix-index for command-not-found handler
   programs.command-not-found.enable = false;
   programs.nix-index = {
+    package = pkgs.nix-index.override {
+      nix-index-unwrapped = pkgs.nix-index-unwrapped.overrideAttrs (oldAttrs: {
+        patches = oldAttrs.patches or [] ++ [
+          ../pkgs/by-name/ni/nix-index/cnfOutput.patch
+        ];
+      });
+
+    };
     enable = true;
     enableBashIntegration = true;
   };
diff --git a/pkgs/by-name/ni/nix-index/override.nix b/pkgs/by-name/ni/nix-index/override.nix
deleted file mode 100644
index e0513e4..0000000
--- a/pkgs/by-name/ni/nix-index/override.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{self, super, package }:
-
-package.override {
-  nix-index-unwrapped = self.nix-index-unwrapped.overrideAttrs (oldAttrs: {
-    patches = oldAttrs.patches or [] ++ [
-      ./cnfOutput.patch
-    ];
-  });
-}