diff --git a/configuration.nix b/configuration.nix
index 2a5baa2..e4339ad 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -9,19 +9,9 @@ let
     ${pkgs.ffmpeg}/bin/ffmpeg -v error -stats -hide_banner -i "$1" -c copy -f null -
   '';
 in {
-  imports = [ ./backup.nix ];
-
   nixpkgs.config.allowUnfree = true;
 
-  nix.settings = {
-    experimental-features = [ "nix-command" "flakes" ];
-    substituters =
-      [ "https://nixcache.shelvacu.com" "https://fossar.cachix.org" ];
-    trusted-public-keys = [
-      "fossar.cachix.org-1:Zv6FuqIboeHPWQS7ysLCJ7UT7xExb4OE8c4LyGb5AsE="
-      "nixcache.shelvacu.com:73u5ZGBpPRoVZfgNJQKYYBt9K9Io/jPwgUfuOLsJbsM="
-    ];
-  };
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
   nix.gc = {
     automatic = true;
@@ -140,7 +130,7 @@ in {
     mullvad-vpn
     qbittorrent
     system-config-printer
-    agenix.packages.${system}.default
+    agenix.packages.x86_64-linux.default
   ];
 
   programs.steam = {
diff --git a/flake.nix b/flake.nix
index 2c97c1d..d118a4d 100755
--- a/flake.nix
+++ b/flake.nix
@@ -15,10 +15,14 @@
   };
 
   outputs = { nixpkgs, phps, common, agenix, ... }: {
-    nixosConfigurations.marauder = nixpkgs.lib.nixosSystem rec {
+    nixosConfigurations.marauder = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-      modules =
-        [ ./configuration.nix common.nixosModule agenix.nixosModules.default ];
+      modules = [
+        ./configuration.nix
+        ./backup.nix
+        common.nixosModule
+        agenix.nixosModules.default
+      ];
       specialArgs = { inherit phps agenix; };
     };
   };