diff --git a/home-manager/modules/default.nix b/home-manager/modules/default.nix
index 99b858e..a3994e8 100644
--- a/home-manager/modules/default.nix
+++ b/home-manager/modules/default.nix
@@ -1,6 +1,7 @@
-{ ... }:
+{ inputs, ... }:
 {
   imports = [
+    inputs.agenix.homeManagerModules.default
     ./common
     ./programs/alacritty
     ./programs/ansible
diff --git a/lib/mk_computer.nix b/lib/mk_computer.nix
index 1d11e50..b7c8827 100644
--- a/lib/mk_computer.nix
+++ b/lib/mk_computer.nix
@@ -46,11 +46,7 @@ inputs.nixpkgs.lib.nixosSystem {
     # Common configuration
     "${inputs.self}/modules"
 
-    inputs.agenix.nixosModules.age
-    {
-      environment.systemPackages = [ inputs.agenix.packages.${system}.default ];
-      az-username = username;
-    }
+    { az-username = username; }
 
     inputs.home-manager.nixosModules.home-manager
     {
@@ -59,9 +55,7 @@ inputs.nixpkgs.lib.nixosSystem {
       home-manager.extraSpecialArgs = {
         inherit inputs system;
       };
-      age.identityPaths = [ "/home/${username}/.ssh/id_rsa" ];
       home-manager.users.${username}.imports = [
-        inputs.agenix.homeManagerModules.default
         "${inputs.self}/home-manager/profiles/${home-module}.nix"
       ];
     }
diff --git a/lib/mk_raspi.nix b/lib/mk_raspi.nix
index d93a14f..0e7fef8 100644
--- a/lib/mk_raspi.nix
+++ b/lib/mk_raspi.nix
@@ -53,11 +53,7 @@ inputs.nixpkgs.lib.nixosSystem {
     # Common configuration
     "${inputs.self}/modules"
 
-    inputs.agenix.nixosModules.age
-    {
-      environment.systemPackages = [ inputs.agenix.packages.${system}.default ];
-      az-username = username;
-    }
+    { az-username = username; }
 
     inputs.home-manager.nixosModules.home-manager
     {
@@ -67,7 +63,6 @@ inputs.nixpkgs.lib.nixosSystem {
         inherit inputs system;
       };
       home-manager.users.${username}.imports = [
-        inputs.agenix.homeManagerModules.default
         "${inputs.self}/home-manager/profiles/${home-module}.nix"
       ];
     }
diff --git a/modules/default.nix b/modules/default.nix
index 609892f..7f03ad7 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,6 +1,7 @@
-{ ... }:
+{ inputs, ... }:
 {
   imports = [
+    inputs.agenix.nixosModules.age
     ./hardware/bluetooth
     ./hardware/dvd
     ./hardware/nvidia
diff --git a/modules/misc/common/default.nix b/modules/misc/common/default.nix
index f5c3327..eb81180 100644
--- a/modules/misc/common/default.nix
+++ b/modules/misc/common/default.nix
@@ -7,8 +7,10 @@
 }:
 let
   nixPath = "/etc/nixPath";
+  system = pkgs.system;
 in
 {
+  age.identityPaths = [ "/home/${config.az-username}/.ssh/id_rsa" ];
   # The rough location
   location = {
     latitude = 46.948;
@@ -83,6 +85,7 @@ in
       sudo = "sudo ";
     };
     systemPackages = [
+      inputs.agenix.packages.${system}.default
       pkgs.bottom
       pkgs.highlight
       pkgs.killall