diff --git a/flake.lock b/flake.lock
index 01840db..6238943 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "crane": {
       "locked": {
-        "lastModified": 1727316705,
-        "narHash": "sha256-/mumx8AQ5xFuCJqxCIOFCHTVlxHkMT21idpbgbm/TIE=",
+        "lastModified": 1748970125,
+        "narHash": "sha256-UDyigbDGv8fvs9aS95yzFfOKkEjx1LO3PL3DsKopohA=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "5b03654ce046b5167e7b0bccbd8244cb56c16f0e",
+        "rev": "323b5746d89e04b22554b061522dfce9e4c49b18",
         "type": "github"
       },
       "original": {
@@ -17,16 +17,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1737569578,
-        "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=",
+        "lastModified": 1747428706,
+        "narHash": "sha256-XVds9FkRrY59xRNNq14FNsFGqDiexXX/mlHcX4hPyyk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "47addd76727f42d351590c905d9d1905ca895b82",
+        "rev": "2e1496bf8652ff4af4e4d4737277f71e4a4f5cb2",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index c1c9112..af735bc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,9 +2,8 @@
   description = "faythe";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
     crane.url = "github:ipetkov/crane";
-    crane.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = { self, crane, nixpkgs }:
@@ -29,8 +28,10 @@
       craneLib = crane.mkLib final;
     };
   in {
-    packages.${system}.${pname} = pkgs.${pname};
-    defaultPackage.${system} = pkgs.${pname};
+    packages.${system} = {
+	${pname} = pkgs.${pname};
+	default = pkgs.${pname};
+    };
 
     overlays.default = final: prev:
       let
@@ -77,7 +78,7 @@
       clippy = pkgs."${pname}-clippy";
     };
 
-    devShell.${system} = with pkgs; mkShell {
+    devShells.${system}.default = with pkgs; mkShell {
       buildInputs = [
         rust-analyzer
         cargo
diff --git a/nixos/lib.nix b/nixos/lib.nix
index a11f936..d3c0ebd 100644
--- a/nixos/lib.nix
+++ b/nixos/lib.nix
@@ -61,7 +61,7 @@ in
                 dnsutils
               ];
 
-              environment.etc."bind/zones/${domain}.zone" = {
+              environment.etc."zones/${domain}.zone" = {
                 mode = "0644";
                 user = "named";
                 group = "named";
@@ -82,7 +82,7 @@ in
 
               services.bind.zones."${domain}" = {
                 master = true;
-                file = "/etc/bind/zones/${domain}.zone";
+                file = "/etc/zones/${domain}.zone";
                 # the bind zone module is very opinionated and this sets allow-transfer.
                 slaves = [ nodes.client.networking.primaryIPAddress ];
                 extraConfig = ''
@@ -91,7 +91,7 @@ in
               };
 
               # Hack to allow access to the directory copied from environment.etc
-              systemd.services.bind.serviceConfig.ExecStartPre = "+${pkgs.coreutils}/bin/chown named /etc/bind/zones";
+              systemd.services.bind.serviceConfig.ExecStartPre = "+${pkgs.coreutils}/bin/chown named /etc/zones";
             };
 
           client =
@@ -154,10 +154,8 @@ in
         testScript = ''
           start_all()
 
-          ns.wait_for_unit("network-online.target")
-          acme.wait_for_unit("network-online.target")
-          client.wait_for_unit("network-online.target")
-
+          acme.wait_for_unit("pebble.service")
+          client.wait_for_unit("faythe.service")
           ns.wait_for_unit("bind.service")
 
           client.wait_until_succeeds("ping -c1 ${nodes.ns.networking.primaryIPAddress}")
diff --git a/src/issuer.rs b/src/issuer.rs
index 0c4d8ae..bd2f68c 100644
--- a/src/issuer.rs
+++ b/src/issuer.rs
@@ -271,7 +271,7 @@ impl Resolvers {
     }
 }
 
-async fn init_resolvers<'l>(config: &FaytheConfig) -> Result<HashMap<String, TokioAsyncResolver>, ResolverError> {
+async fn init_resolvers(config: &FaytheConfig) -> Result<HashMap<String, TokioAsyncResolver>, ResolverError> {
     let mut resolvers = HashMap::new();
 
     for z in &config.zones {