diff --git a/configs/packages.nix b/configs/packages.nix
index 2ec3653..37f7793 100644
--- a/configs/packages.nix
+++ b/configs/packages.nix
@@ -206,9 +206,6 @@ in {
     ncspot
     playerctl
 
-    nix-index
-    niveumPackages.nix-index-update
-
     #krebs
     pkgs.nur.repos.mic92.ircsink
 
diff --git a/flake.nix b/flake.nix
index f873e8c..1dd9ebf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,6 +10,7 @@
     home-manager.url = "github:nix-community/home-manager/release-25.11";
     menstruation-backend.url = "github:kmein/menstruation.rs";
     menstruation-telegram.url = "github:kmein/menstruation-telegram";
+    nix-index-database.url = "github:nix-community/nix-index-database";
     nix-on-droid.url = "github:t184256/nix-on-droid/release-23.05";
     nixinate.url = "github:matthewcroughan/nixinate";
     nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0";
@@ -27,13 +28,14 @@
     wallpaper-generator.url = "github:pinpox/wallpaper-generator/v1.1";
     wallpapers.url = "github:kmein/wallpapers";
 
-    autorenkalender.inputs.nixpkgs.follows = "nixpkgs";
     agenix.inputs.home-manager.follows = "home-manager";
     agenix.inputs.nixpkgs.follows = "nixpkgs";
+    autorenkalender.inputs.nixpkgs.follows = "nixpkgs";
     coptic-dictionary.inputs.nixpkgs.follows = "nixpkgs";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     menstruation-telegram.inputs.menstruation-backend.follows = "menstruation-backend";
     menstruation-telegram.inputs.nixpkgs.follows = "nixpkgs-old";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
     nix-on-droid.inputs.home-manager.follows = "home-manager";
     nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
     recht.inputs.nixpkgs.follows = "nixpkgs";
@@ -56,6 +58,7 @@
       nixinate,
       flake-utils,
       nix-on-droid,
+      nix-index-database,
       stylix,
       ...
     }:
@@ -292,6 +295,7 @@
             agenix.nixosModules.default
             retiolum.nixosModules.retiolum
             home-manager.nixosModules.home-manager
+            nix-index-database.nixosModules.default
             nur.modules.nixos.default
             stylix.nixosModules.stylix
           ];
@@ -305,6 +309,7 @@
             retiolum.nixosModules.retiolum
             home-manager.nixosModules.home-manager
             nur.modules.nixos.default
+            nix-index-database.nixosModules.default
             stylix.nixosModules.stylix
           ];
         };
@@ -317,6 +322,7 @@
             retiolum.nixosModules.retiolum
             home-manager.nixosModules.home-manager
             nur.modules.nixos.default
+            nix-index-database.nixosModules.default
             stylix.nixosModules.stylix
           ];
         };
@@ -334,9 +340,6 @@
             })
           ];
         };
-        unstablePackages = import nixpkgs-unstable {
-          inherit system;
-        };
         wrapScript = {
           packages ? [],
           name,
@@ -401,7 +404,6 @@
         mpv-iptv = pkgs.callPackage packages/mpv-iptv.nix {};
         new-mac = pkgs.callPackage packages/new-mac.nix {};
         nix-git = pkgs.callPackage packages/nix-git.nix {};
-        nix-index-update = pkgs.callPackage packages/nix-index-update.nix {inherit system;};
         notemenu = pkgs.callPackage packages/notemenu.nix {niveumPackages = self.packages.${system};};
         opustags = pkgs.callPackage packages/opustags.nix {};
         q = pkgs.callPackage packages/q.nix {};
diff --git a/packages/nix-index-update.nix b/packages/nix-index-update.nix
deleted file mode 100644
index 29719cf..0000000
--- a/packages/nix-index-update.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  writers,
-  wget,
-  system,
-}:
-writers.writeDashBin "nix-index-update" ''
-  filename="index-${system}"
-  mkdir -p ~/.cache/nix-index
-  cd ~/.cache/nix-index
-  # -N will only download a new version if there is an update.
-  ${wget}/bin/wget -q -N https://github.com/Mic92/nix-index-database/releases/latest/download/$filename
-  ln -f $filename files
-''