diff --git a/flake.nix b/flake.nix
index 08e63d0..2e30233 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,6 @@
     eachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system});
     treefmtEval = eachSystem (pkgs: treefmt-nix.lib.evalModule pkgs ./treefmt.nix);
   in {
-    imports = [./modules];
     devShells = eachSystem (pkgs: {
       default = pkgs.mkShell {
         packages = [
@@ -30,7 +29,8 @@
     in
       import ./hosts {inherit inputs lib';};
     packages = eachSystem (pkgs: import ./pkgs {inherit inputs pkgs;});
-    deploy.nodes = import ./nodes {inherit self inputs;};
+    deploy.nodes = import ./nodes {inherit inputs;};
+    checks = builtins.mapAttrs (_: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
   };
   inputs = {
     # nix related
diff --git a/hosts/anastacia/default.nix b/hosts/anastacia/default.nix
index 444020b..66498c2 100644
--- a/hosts/anastacia/default.nix
+++ b/hosts/anastacia/default.nix
@@ -1,9 +1,5 @@
-{
-  self,
-  inputs,
-  ...
-}: let
-  mod = "${self}/system";
+{inputs, ...}: let
+  system = "${inputs.self}/system";
 in {
   imports = [
     ./hardware-configuration.nix
@@ -11,9 +7,9 @@ in {
 
     inputs.agenix.nixosModules.default
 
-    "${mod}/services/forgejo.nix"
-    "${mod}/services/searx.nix"
-    "${mod}/services/portfolio.nix"
+    "${system}/services/forgejo.nix"
+    "${system}/services/searx.nix"
+    "${system}/services/portfolio.nix"
   ];
 
   boot.tmp.cleanOnBoot = true;
diff --git a/hosts/solaire/default.nix b/hosts/solaire/default.nix
index f19bfcd..4d08433 100644
--- a/hosts/solaire/default.nix
+++ b/hosts/solaire/default.nix
@@ -1,6 +1,10 @@
-{specialArgs, ...}: let
-  system = ../../system;
-  home = ../../home;
+{
+  inputs,
+  specialArgs,
+  ...
+}: let
+  system = "${inputs.self}/system";
+  home = "${inputs.self}/home";
 in {
   imports = [
     ./hardware-configuration.nix
diff --git a/hosts/vamos/default.nix b/hosts/vamos/default.nix
index 5ad95f4..b36b2c7 100644
--- a/hosts/vamos/default.nix
+++ b/hosts/vamos/default.nix
@@ -1,6 +1,10 @@
-{specialArgs, ...}: let
-  system = ../../system;
-  home = ../../home;
+{
+  inputs,
+  specialArgs,
+  ...
+}: let
+  system = "${inputs.self}/system";
+  home = "${inputs.self}/home";
 in {
   imports = [
     ./hardware-configuration.nix
diff --git a/nodes/default.nix b/nodes/default.nix
index 8ed1e95..56396b2 100644
--- a/nodes/default.nix
+++ b/nodes/default.nix
@@ -1,14 +1,10 @@
-{
-  self,
-  inputs,
-  ...
-}: {
+{inputs, ...}: {
   anastacia = {
     hostname = "2a01:4f8:1c1c:8495::1";
     profiles.system = {
       sshUser = "root";
       user = "root";
-      path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.anastacia;
+      path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.anastacia;
     };
   };
 }
diff --git a/secrets/searx-env-file.age b/secrets/searx-env-file.age
index 8ede959..1aaa42f 100644
Binary files a/secrets/searx-env-file.age and b/secrets/searx-env-file.age differ