diff --git a/flake.lock b/flake.lock
index 3fdd571..f0aa122 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,9 +5,7 @@
         "flake-utils": [
           "flake-utils"
         ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
         "lastModified": 1641157028,
@@ -187,16 +185,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1642798845,
-        "narHash": "sha256-1g1X3wKmroGix68OXwb4gR1yXKPQ36apI1dssd/YbuM=",
+        "lastModified": 1619464443,
+        "narHash": "sha256-R7WAb8EnkIJxxaF6GTHUPytjonhB4Zm0iatyWoW169A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e84444b14cc75a4be17b58fd2c344f47dddf084e",
+        "rev": "8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-21.11",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -243,6 +241,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1642798845,
+        "narHash": "sha256-1g1X3wKmroGix68OXwb4gR1yXKPQ36apI1dssd/YbuM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "e84444b14cc75a4be17b58fd2c344f47dddf084e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-21.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "AriaNg": "AriaNg",
@@ -254,7 +268,7 @@
         "krops": "krops",
         "nix-pre-commit-hooks": "nix-pre-commit-hooks",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-overlay": "nixpkgs-overlay",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "sops-nix": "sops-nix"
diff --git a/flake.nix b/flake.nix
index 66b0b42..fec2558 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,7 +41,6 @@
 
     AriaNg.url = "git+https://git.sbruder.de/simon/AriaNg";
     AriaNg.inputs.flake-utils.follows = "flake-utils";
-    AriaNg.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
diff --git a/machines/fuuko/services/torrent.nix b/machines/fuuko/services/torrent.nix
index f603554..d39a906 100644
--- a/machines/fuuko/services/torrent.nix
+++ b/machines/fuuko/services/torrent.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, inputs, lib, pkgs, ... }:
 let
   homeDir = "/var/lib/aria2";
   downloadDir = "/data/torrent";
@@ -163,7 +163,7 @@ in
 
     locations = {
       "/" = {
-        root = pkgs.AriaNg;
+        root = inputs.AriaNg.packages.${config.nixpkgs.system}.AriaNg;
       };
       "/jsonrpc" = {
         proxyPass = "http://unix:${homeDir}/rpc.sock";
diff --git a/modules/nix.nix b/modules/nix.nix
index 897b501..689a73b 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -81,8 +81,6 @@ in
           system;
       };
     })
-
-    AriaNg.overlay
   ];
 
   environment.systemPackages = with pkgs; [