diff --git a/modules/nixos/common/agenix.nix b/modules/nixos/common/agenix.nix
new file mode 100644
index 0000000..339885e
--- /dev/null
+++ b/modules/nixos/common/agenix.nix
@@ -0,0 +1,6 @@
+{ inputs, ... }:
+{
+  imports = [
+    inputs.agenix.nixosModules.age
+  ];
+}
diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix
index 85b73c1..6a01d5e 100644
--- a/modules/nixos/common/default.nix
+++ b/modules/nixos/common/default.nix
@@ -8,13 +8,12 @@
   imports = [
     ../../shared/known-hosts.nix
     ../../shared/nix-daemon.nix
+    ./agenix.nix
     ./security.nix
     ./sops-nix.nix
     ./telegraf.nix
     ./update.nix
     ./users.nix
-    inputs.sops-nix.nixosModules.sops
-    inputs.agenix.nixosModules.age
     inputs.srvos.nixosModules.server
   ];
 
diff --git a/modules/nixos/common/sops-nix.nix b/modules/nixos/common/sops-nix.nix
index 3ad6a72..6858440 100644
--- a/modules/nixos/common/sops-nix.nix
+++ b/modules/nixos/common/sops-nix.nix
@@ -8,5 +8,9 @@ let
   defaultSopsPath = "${toString inputs.self}/hosts/${config.networking.hostName}/secrets.yaml";
 in
 {
+  imports = [
+    inputs.sops-nix.nixosModules.sops
+  ];
+
   sops.defaultSopsFile = lib.mkIf (builtins.pathExists defaultSopsPath) defaultSopsPath;
 }