diff --git a/flake.nix b/flake.nix
index 9c145bd..06b0c5b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -85,9 +85,9 @@
             };
             hypnos = nixpkgs.lib.nixosSystem {
                 system = "aarch64-linux";
-                specialArgs = { inherit inputs; };
+                # specialArgs = { inherit inputs; };
                 modules = [
-                    ./hosts/hypnos/configuration.nix
+                    ( import ./hosts/hypnos/configuration.nix inputs )
                     {
                         environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath;
                         nix.nixPath = [ "nixpkgs=/etc/nix/inputs/nixpkgs" ];
diff --git a/hosts/hypnos/configuration.nix b/hosts/hypnos/configuration.nix
index f8f1673..3fe4f3d 100644
--- a/hosts/hypnos/configuration.nix
+++ b/hosts/hypnos/configuration.nix
@@ -1,5 +1,5 @@
 
-  { config, pkgs, lib, inputs, ... }:
+inputs: { config, pkgs, lib, ... }:
 
   let
     user = "graphite";
@@ -25,6 +25,10 @@
       # "${nixosHardware}/raspberry-pi/4"
       ./hardware-configuration.nix
       "${inputs.nixos-hardware}/raspberry-pi/4"
+      ( import ./services/forge.nix inputs )
+      ( import ./services/cloud.nix inputs )
+      ( import ./services/vaultwarden.nix inputs )
+      ( import ./services/matrix.nix inputs )
     ];
     boot.loader.grub.enable = false;
     boot.loader.generic-extlinux-compatible.enable = true;