diff --git a/config/services/hydra.nix b/config/services/hydra.nix
index 443157d5..402a59d2 100644
--- a/config/services/hydra.nix
+++ b/config/services/hydra.nix
@@ -60,7 +60,7 @@ in {
   ];
   services.hydra-dev = {
     enable = true;
-    package = pkgs.hydra.overrideAttrs (super: {
+    package = hydra.packages.${system}.hydra.overrideAttrs (super: {
       doCheck = false;
       doInstallCheck = false;
       patches =
diff --git a/flake.lock b/flake.lock
index 5ae89eff..896441e2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -257,6 +257,22 @@
         "type": "github"
       }
     },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -298,6 +314,28 @@
         "type": "github"
       }
     },
+    "flake-parts_3": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "hydra",
+          "nix-eval-jobs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1722555600,
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": [
@@ -383,11 +421,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726308872,
-        "narHash": "sha256-d4vwO5N4RsLnCY7k5tY9xbdYDWQsY3RDMeUoIa4ms2A=",
+        "lastModified": 1726440980,
+        "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6c1a461a444e6ccb3f3e42bb627b510c3a722a57",
+        "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
         "type": "github"
       },
       "original": {
@@ -398,15 +436,9 @@
     },
     "hydra": {
       "inputs": {
-        "lix": [
-          "lix"
-        ],
-        "nix-eval-jobs": [
-          "nix-eval-jobs"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "lix": "lix",
+        "nix-eval-jobs": "nix-eval-jobs",
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1725317763,
@@ -447,11 +479,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725797487,
-        "narHash": "sha256-1NqTS6PePeoLVH8UY6poIoxlNq1Hhgn7RZs+OT8b2wQ=",
+        "lastModified": 1726402305,
+        "narHash": "sha256-Ps21x+17J0rclqg68crak2Vo/P3+1fZStqmV+OI7k6M=",
         "owner": "nix-community",
         "repo": "lib-aggregate",
-        "rev": "3c180ce6583583285ef1b105cbc1667ba00c3e8d",
+        "rev": "90b637e33ab9be23e0ba3c57905a1837561923ea",
         "type": "github"
       },
       "original": {
@@ -462,26 +494,21 @@
     },
     "lix": {
       "inputs": {
-        "flake-compat": [
-          "flake-compat"
-        ],
-        "nix2container": [
-          "nix2container"
-        ],
+        "flake-compat": "flake-compat_2",
+        "nix2container": "nix2container",
         "nixpkgs": [
+          "hydra",
           "nixpkgs"
         ],
         "nixpkgs-regression": "nixpkgs-regression",
-        "pre-commit-hooks": [
-          "pre-commit-hooks"
-        ]
+        "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1726121662,
-        "narHash": "sha256-SEAWoCiTJUkhWiCx8jj+eWeJhrVk6/NMZIHlILjaYJk=",
+        "lastModified": 1725228396,
+        "narHash": "sha256-QBXwqyPuHUKBiuyzHBxqH/MpjPY9DQiY2M81P2t6b/0=",
         "ref": "refs/heads/main",
-        "rev": "b2fc007811a5afc473bf116fe8d38688b3699e25",
-        "revCount": 16238,
+        "rev": "02eb07cfd539c34c080cb1baf042e5e780c1fcc2",
+        "revCount": 16214,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/lix"
       },
@@ -519,6 +546,36 @@
         "url": "https://git.lix.systems/lix-project/nixos-module"
       }
     },
+    "lix_2": {
+      "inputs": {
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "nix2container": [
+          "nix2container"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-regression": "nixpkgs-regression_2",
+        "pre-commit-hooks": [
+          "pre-commit-hooks"
+        ]
+      },
+      "locked": {
+        "lastModified": 1726411950,
+        "narHash": "sha256-OnPGWKN3mJCsbdt4zOCVSTWg8N9QX+VTCXDcYviStTk=",
+        "ref": "refs/heads/main",
+        "rev": "80202e3ca314c21547c48f3a23d3f629cd9ddb87",
+        "revCount": 16245,
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/lix"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/lix"
+      }
+    },
     "naersk": {
       "inputs": {
         "nixpkgs": [
@@ -542,21 +599,17 @@
     },
     "nix-eval-jobs": {
       "inputs": {
-        "flake-parts": [
-          "flake-parts"
-        ],
+        "flake-parts": "flake-parts_3",
         "lix": [
+          "hydra",
           "lix"
         ],
-        "nix-github-actions": [
-          "nix-github-actions"
-        ],
+        "nix-github-actions": "nix-github-actions",
         "nixpkgs": [
+          "hydra",
           "nixpkgs"
         ],
-        "treefmt-nix": [
-          "treefmt-nix"
-        ]
+        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
         "lastModified": 1723579251,
@@ -583,11 +636,11 @@
         "umu": "umu"
       },
       "locked": {
-        "lastModified": 1726104489,
-        "narHash": "sha256-nn2Rp6Op78xWF8OJa0utad8yvrxf93K7BcOEwPtafg8=",
+        "lastModified": 1726364380,
+        "narHash": "sha256-hICWlRKF1lOzRwTepJORe9hWYGkUVXJxKjTe5P5CSg0=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "3a97598cb9ca7eed51bc361b025ed26cc52852e0",
+        "rev": "3e51c9884bca93625ff1deca440e30c8d2f2e522",
         "type": "github"
       },
       "original": {
@@ -599,6 +652,8 @@
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
+          "hydra",
+          "nix-eval-jobs",
           "nixpkgs"
         ]
       },
@@ -617,6 +672,22 @@
       }
     },
     "nix2container": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1720642556,
+        "narHash": "sha256-qsnqk13UmREKmRT7c8hEnz26X3GFFyIQrqx4EaRc1Is=",
+        "owner": "nlewo",
+        "repo": "nix2container",
+        "rev": "3853e5caf9ad24103b13aa6e0e8bcebb47649fe4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nlewo",
+        "repo": "nix2container",
+        "type": "github"
+      }
+    },
+    "nix2container_2": {
       "inputs": {
         "flake-utils": [
           "flake-utils"
@@ -641,11 +712,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1725885300,
-        "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=",
+        "lastModified": 1726489388,
+        "narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e",
+        "rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9",
         "type": "github"
       },
       "original": {
@@ -708,6 +779,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-regression_2": {
+      "locked": {
+        "lastModified": 1643052045,
+        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1725826545,
@@ -726,11 +813,27 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1726337284,
-        "narHash": "sha256-FbFpKgoKXLOkbIn2fhNBjol+Rixg76i2HWj2Pfm93mg=",
+        "lastModified": 1726320982,
+        "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d56bce1f04ef025729b332857d8c92e058b4be25",
+        "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1726508288,
+        "narHash": "sha256-ameaqiVLPGXDDgyBoHKhoyTVkVxSeeXlrOv/PZnK3so=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3540ebe5534a9e7f38b3c782dba8a03eaeae7303",
         "type": "github"
       },
       "original": {
@@ -740,6 +843,22 @@
       }
     },
     "pre-commit-hooks": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1721042469,
+        "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks_2": {
       "inputs": {
         "flake-compat": [
           "flake-compat"
@@ -809,22 +928,19 @@
         "hydra": "hydra",
         "impermanence": "impermanence",
         "lib-aggregate": "lib-aggregate",
-        "lix": "lix",
+        "lix": "lix_2",
         "lix-module": "lix-module",
         "naersk": "naersk",
-        "nix-eval-jobs": "nix-eval-jobs",
         "nix-gaming": "nix-gaming",
-        "nix-github-actions": "nix-github-actions",
-        "nix2container": "nix2container",
+        "nix2container": "nix2container_2",
         "nixos-hardware": "nixos-hardware",
         "nixos-vscode-server": "nixos-vscode-server",
-        "nixpkgs": "nixpkgs_2",
-        "pre-commit-hooks": "pre-commit-hooks",
+        "nixpkgs": "nixpkgs_3",
+        "pre-commit-hooks": "pre-commit-hooks_2",
         "riscv-overlay": "riscv-overlay",
         "rust-overlay": "rust-overlay",
         "sops-nix": "sops-nix",
-        "systems": "systems",
-        "treefmt-nix": "treefmt-nix"
+        "systems": "systems"
       }
     },
     "rust-overlay": {
@@ -834,11 +950,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726280639,
-        "narHash": "sha256-YfLRPlFZWrT2oRLNAoqf7G3+NnUTDdlIJk6tmBU7kXM=",
+        "lastModified": 1726453838,
+        "narHash": "sha256-pupsow4L79SBfNwT6vh/5RAbVZuhngIA0RTCZksXmZY=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "e9f8641c92f26fd1e076e705edb12147c384171d",
+        "rev": "ca2e79cd22625d214b8437c2c4080ce79bd9f7d2",
         "type": "github"
       },
       "original": {
@@ -888,15 +1004,17 @@
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
+          "hydra",
+          "nix-eval-jobs",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1725271838,
-        "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=",
+        "lastModified": 1723454642,
+        "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd",
+        "rev": "349de7bc435bdff37785c2466f054ed1766173be",
         "type": "github"
       },
       "original": {
@@ -914,11 +1032,11 @@
       },
       "locked": {
         "dir": "packaging/nix",
-        "lastModified": 1725408497,
-        "narHash": "sha256-wyJPWwHzHpFwc9XP9nM/Lpbvahusp2NcUtWXlErGi1g=",
+        "lastModified": 1726301236,
+        "narHash": "sha256-0JQH9RYdGL1NUaQE5syA/SmbxuZ6NTLn3FduapSXUXA=",
         "ref": "refs/heads/main",
-        "rev": "2d3c948a51bc1d2880a90bf985947f9afc89e8d1",
-        "revCount": 713,
+        "rev": "e06443981e3bf09cbc70aaffe245e4a03f1a6df7",
+        "revCount": 715,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
diff --git a/flake.nix b/flake.nix
index a3527e26..3b429a2b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -90,9 +90,9 @@ rec {
     };
     hydra = {
       url = "git+https://git.lix.systems/lix-project/hydra";
-      inputs.lix.follows = "lix";
-      inputs.nix-eval-jobs.follows = "nix-eval-jobs";
-      inputs.nixpkgs.follows = "nixpkgs";
+      #inputs.lix.follows = "lix";
+      #inputs.nix-eval-jobs.follows = "nix-eval-jobs";
+      #inputs.nixpkgs.follows = "nixpkgs";
     };
     impermanence = {
       url = "github:nix-community/impermanence";
@@ -120,23 +120,11 @@ rec {
       url = "github:nix-community/naersk/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nix-eval-jobs = {
-      url = "git+https://git.lix.systems/lix-project/nix-eval-jobs";
-      inputs.flake-parts.follows = "flake-parts";
-      inputs.lix.follows = "lix";
-      inputs.nix-github-actions.follows = "nix-github-actions";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.treefmt-nix.follows = "treefmt-nix";
-    };
     nix-gaming = {
       url = "github:fufexan/nix-gaming";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-parts.follows = "flake-parts";
     };
-    nix-github-actions = {
-      url = "github:nix-community/nix-github-actions";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nix2container = {
       url = "github:nlewo/nix2container";
       inputs.flake-utils.follows = "flake-utils";
@@ -170,10 +158,6 @@ rec {
       inputs.nixpkgs-stable.follows = "nixpkgs";
     };
     systems.url = "github:nix-systems/default";
-    treefmt-nix = {
-      url = "github:numtide/treefmt-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs = {
diff --git a/packages/matrix/mautrix-whatsapp/source.json b/packages/matrix/mautrix-whatsapp/source.json
index 7e955462..fe024656 100644
--- a/packages/matrix/mautrix-whatsapp/source.json
+++ b/packages/matrix/mautrix-whatsapp/source.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/mautrix/whatsapp",
-  "rev": "33a995413a1f71a5850a185fd359c4eb832d70a3",
-  "date": "2024-09-14T12:48:46+03:00",
-  "path": "/nix/store/svgwj7n65pj230hqpzd0223y2zysh0c5-whatsapp",
-  "sha256": "1zcbwdng22cv4qj3bn3r25fkxfc7s8n1rzbwm0pr88dkw1yh37ws",
-  "hash": "sha256-mp8BfeCzIZQvqHz9HCzSh7k+XRF52DUkJpsJ8Wzji/0=",
+  "rev": "d604b0fd13f9864cfc1f92402a6af3f057697dec",
+  "date": "2024-09-16T15:57:50+03:00",
+  "path": "/nix/store/q0y8mdcqz4zzvlgis51df7d9cjbv4qmm-whatsapp",
+  "sha256": "1z43430a504p5lymh0s88z088z8qqlzpqwxr29vjfis4zp46mcq7",
+  "hash": "sha256-B7NqyP1ERyd3ErlzfD/FGH2EwEdIA1g9LZeAosAgg/w=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,