diff --git a/flake.nix b/flake.nix
index d2be14d..c897bc8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,13 +7,17 @@
   inputs.deploy-rs.url = "github:serokell/deploy-rs";
   inputs.home-manager.url = "github:nix-community/home-manager/release-22.11";
   inputs.sops-nix.url = "github:Mic92/sops-nix";
+  inputs.scalpel.url = "github:polygon/scalpel";
 
   inputs.home-manager.inputs.nixpkgs.follows = "nixpkgs";
   inputs.home-manager.inputs.utils.follows = "deploy-rs/utils";
 
   inputs.sops-nix.inputs.nixpkgs.follows = "nixpkgs";
 
-  outputs = { self, nixpkgs, deploy-rs, home-manager, sops-nix, nixpkgs-unstable, ... }@inputs:
+  inputs.scalpel.inputs.nixpkgs.follows = "nixpkgs";
+  inputs.scalpel.inputs.sops-nix.follows = "sops-nix";
+
+  outputs = { self, nixpkgs, deploy-rs, home-manager, sops-nix, scalpel, nixpkgs-unstable, ... }@inputs:
     let
       system = "x86_64-linux";
       pkgs = import nixpkgs {
@@ -27,35 +31,47 @@
     in
     {
       nixosConfigurations.clicks =
-        nixpkgs.lib.nixosSystem {
-          inherit system pkgs;
+        let
+          base = nixpkgs.lib.nixosSystem {
+            inherit system pkgs;
+            modules = [
+              ./default/configuration.nix
+              ./default/hardware-configuration.nix
+              ./modules/caddy.nix
+              ./modules/clamav.nix
+              ./modules/code-server.nix
+              ./modules/dmarc.nix
+              ./modules/dnsmasq.nix
+              ./modules/doas.nix
+              ./modules/docker.nix
+              ./modules/ecryptfs.nix
+              ./modules/fail2ban.nix
+              ./modules/fuck.nix
+              ./modules/git.nix
+              ./modules/grafana.nix
+              ./modules/home-manager-users.nix
+              ./modules/kitty.nix
+              ./modules/matrix.nix
+              ./modules/mongodb.nix
+              ./modules/node.nix
+              ./modules/postgres.nix
+              ./modules/samba.nix
+              ./modules/scalpel.nix
+              ./modules/tesseract.nix
+              sops-nix.nixosModules.sops
+              {
+                users.mutableUsers = false;
+                _module.args = { inherit pkgs-unstable; };
+              }
+            ];
+            specialArgs = { base = null; };
+          };
+        in
+        base.extendModules {
           modules = [
-            ./default/configuration.nix
-            ./default/hardware-configuration.nix
-            ./modules/caddy.nix
-            ./modules/clamav.nix
-            ./modules/code-server.nix
-            ./modules/dmarc.nix
-            ./modules/dnsmasq.nix
-            ./modules/doas.nix
-            ./modules/docker.nix
-            ./modules/ecryptfs.nix
-            ./modules/fail2ban.nix
-            ./modules/fuck.nix
-            ./modules/git.nix
-            ./modules/grafana.nix
-            ./modules/home-manager-users.nix
-            ./modules/kitty.nix
-            ./modules/mongodb.nix
-            ./modules/node.nix
-            ./modules/samba.nix
-            ./modules/tesseract.nix
-            sops-nix.nixosModules.sops
-            {
-              users.mutableUsers = false;
-              _module.args = { inherit pkgs-unstable; };
-            }
+            scalpel.nixosModules.scalpel
           ];
+          specialArgs = { inherit base; };
         };
 
       deploy.nodes.clicks = {