diff --git a/flake.lock b/flake.lock
index 18c029ef..019f9a2a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,24 +1,102 @@
 {
   "nodes": {
+    "hydra": {
+      "info": {
+        "lastModified": 1586949285,
+        "narHash": "sha256-mXvLmicI1XtturvkuBbt1Fe4MsiGlbbK8Qlg8pyIyY4="
+      },
+      "inputs": {
+        "nix": "nix",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "owner": "ehmry",
+        "repo": "hydra",
+        "rev": "59bb3ab8e854cb52782077f2c5a80471d0004ac8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ehmry",
+        "ref": "sotest",
+        "repo": "hydra",
+        "type": "github"
+      }
+    },
+    "nix": {
+      "info": {
+        "lastModified": 1586440843,
+        "narHash": "sha256-7YxrpRPmAOoCSl6KtepKCXcae5MUm1Pl+lwDunBFGoo="
+      },
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "owner": "NixOS",
+        "repo": "nix",
+        "rev": "3aaceeb7e2d3fb8a07a1aa5a21df1dca6bbaa0ef",
+        "type": "github"
+      },
+      "original": {
+        "id": "nix",
+        "type": "indirect"
+      }
+    },
     "nixpkgs": {
       "info": {
-        "lastModified": 1586508340,
-        "narHash": "sha256-d5jSxQw5h2N72iLnMP1ri5atw5oTsjLvgO4cTe1C2IM="
+        "lastModified": 1585405475,
+        "narHash": "sha256-bESW0n4KgPmZ0luxvwJ+UyATrC6iIltVCsGdLiphVeE="
       },
       "locked": {
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "807ca93fadd5197c2260490de0c76e500562dc05",
+        "rev": "b88ff468e9850410070d4e0ccd68c7011f15b2be",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
+        "ref": "nixos-20.03-small",
         "type": "indirect"
       }
     },
+    "nixpkgs_2": {
+      "info": {
+        "lastModified": 1586219474,
+        "narHash": "sha256-fvfrMnEA2lDnXvH/eInGV5i0sO/EGLVHa4pOek8VG78="
+      },
+      "locked": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "29eddfc36d720dcc4822581175217543b387b1e8",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-20.03",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_3": {
+      "info": {
+        "lastModified": 1586724123,
+        "narHash": "sha256-VQ7zZy2xpz6dULpjar4jxNaQ0N/2q68l+EYO2nXaXDo="
+      },
+      "locked": {
+        "owner": "nixos",
+        "repo": "nixpkgs-channels",
+        "rev": "708cb6b307b04ad862cc50de792e57e7a4a8bb5a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-20.03",
+        "repo": "nixpkgs-channels",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "hydra": "hydra",
+        "nixpkgs": "nixpkgs_3"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index ec1e9ff4..8789aa95 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,10 +3,13 @@
 
   edition = 201909;
 
-  outputs = { self, nixpkgs }: {
+  inputs.nixpkgs.url = "github:nixos/nixpkgs-channels/nixos-20.03";
+  inputs.hydra.url = "github:ehmry/hydra/sotest";
+
+  outputs = { self, nixpkgs, hydra }: {
 
     nixosConfigurations.server7 = nixpkgs.lib.nixosSystem {
-      modules = [ ./hosts/server7 ];
+      modules = [ ./hosts/server7 hydra.nixosModules.hydra ];
       system = "x86_64-linux";
     };
 
diff --git a/hosts/server7/hydra.nix b/hosts/server7/hydra.nix
index 53481e63..872bfde9 100644
--- a/hosts/server7/hydra.nix
+++ b/hosts/server7/hydra.nix
@@ -2,12 +2,11 @@
 
 {
 
-  services.hydra = {
+  services.hydra-dev = {
     enable = true;
     hydraURL = "https://server7.hq.c3d2.de";
     logo = ./hydra.svg;
     notificationSender = "hydra@spam.works";
-    package = pkgs.hydra-unstable;
     listenHost = "127.0.0.1";
   };
 
@@ -28,7 +27,7 @@
         addSSL = true;
         enableACME = true;
         locations."/".proxyPass =
-          "http://127.0.0.1:${toString config.services.hydra.port}";
+          "http://127.0.0.1:${toString config.services.hydra-dev.port}";
       };
     };
   };