diff --git a/flake.nix b/flake.nix
index 0394192..83d7ae4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -78,7 +78,10 @@
             configurationNix
 
             # Common configuration
-            (import ./modules/common-x86 {inherit custom inputs pkgs system;})
+            ./modules/common-x86
+
+			agenix.nixosModules.age
+			{ environment.systemPackages = [ agenix.defaultPackage.${system} ]; }
 
             home-manager.nixosModules.home-manager
             {
@@ -99,7 +102,10 @@
             configurationNix
 
             # Common configuration
-            (import ./modules/common {inherit custom inputs pkgs system;})
+            ./modules/common
+
+			agenix.nixosModules.age
+			{ environment.systemPackages = [ agenix.defaultPackage.${system} ]; }
 
             home-manager.nixosModules.home-manager
             {
diff --git a/modules/cli/default.nix b/modules/cli/default.nix
index db89e15..5d6064f 100644
--- a/modules/cli/default.nix
+++ b/modules/cli/default.nix
@@ -1,4 +1,4 @@
-{ inputs, pkgs, system, ... }:
+{ pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [
@@ -14,7 +14,6 @@
     unzip
     vim
     wget
-    inputs.agenix.defaultPackage."${system}"
   ];
   environment.shellAliases = {
     format-modules = "nixpkgs-fmt **/*.nix";
diff --git a/modules/common-x86/default.nix b/modules/common-x86/default.nix
index 0aeae5a..15d2a02 100644
--- a/modules/common-x86/default.nix
+++ b/modules/common-x86/default.nix
@@ -1,7 +1,7 @@
-{ inputs, custom, pkgs, system, ... }:
+{ inputs, ... }:
 {
   imports = [
-    (import "${inputs.self}/modules/common" {inherit inputs custom pkgs system;})
+    "${inputs.self}/modules/common"
   ];
 
   # Use the systemd-boot EFI boot loader.
diff --git a/modules/common/default.nix b/modules/common/default.nix
index 0120e60..1ea6e2f 100644
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -2,7 +2,6 @@
 {
   imports = [
     (import "${inputs.self}/modules/cli" { inherit inputs pkgs system; })
-    inputs.agenix.nixosModule
   ];
 
   # The rough location