diff --git a/nixos/modules/monitoring/exporters/node.nix b/nixos/modules/monitoring/exporters/node.nix
index 8f183c112cd8246c835c6934aa073309d76a3609..bff40603c68c558e5b50b082c881e9a5af92af10 100644
--- a/nixos/modules/monitoring/exporters/node.nix
+++ b/nixos/modules/monitoring/exporters/node.nix
@@ -77,7 +77,7 @@ in {
     ) ++ (
       optionals (mountsFileSystemType "xfs") [ "xfs" ]
     ) ++ (
-      optionals (mountsFileSystemType "zfs" || elem "zfs" config.boot.supportedFilesystems) [ "zfs" ]
+      optionals (mountsFileSystemType "zfs" || config.boot.supportedFilesystems.zfs or false) [ "zfs" ]
     );
   };
 }
diff --git a/nixos/modules/monitoring/server/loki.nix b/nixos/modules/monitoring/server/loki.nix
index 25f2b548dc882d0bc62543d3972d4e7c2017f742..e9a3056b204e2552351a047ee39152ec562d8390 100644
--- a/nixos/modules/monitoring/server/loki.nix
+++ b/nixos/modules/monitoring/server/loki.nix
@@ -49,7 +49,6 @@ in {
             final_sleep = "0s";
           };
           chunk_target_size = 1536000; # As per https://grafana.com/docs/loki/v2.2.1/best-practices/
-          max_transfer_retries = 0; # Chunk transfers disabled
         };
 
         schema_config = {
@@ -65,6 +64,10 @@ in {
           }];
         };
 
+        limits_config = {
+          allow_structured_metadata = false;
+        };
+
         table_manager = {
           retention_deletes_enabled = true;
           retention_period = logRetention;
diff --git a/nixpkgs.json b/nixpkgs.json
index 8537d7f25669f6544488218f9d2fd8ac11ab12f4..96d9ff85d10acb96ffb42d364a95efdf475524c6 100644
--- a/nixpkgs.json
+++ b/nixpkgs.json
@@ -1,5 +1,5 @@
 {
   "name": "source",
-  "url": "https://releases.nixos.org/nixos/23.11/nixos-23.11.7476.a62e6edd6d5e/nixexprs.tar.xz",
-  "sha256": "0acylxwnjlx3g4fifgl8cxx6qc9lcnv3kcfgn6mws1rpifw3f2nd"
+  "url": "https://releases.nixos.org/nixos/24.05/nixos-24.05.803.b3b2b28c1daa/nixexprs.tar.xz",
+  "sha256": "186cvfziz5kd7qknw4fb9z2b2fpqi9gbsyw3gky7hmj0bzdan64b"
 }
\ No newline at end of file
diff --git a/tools/update-nixpkgs b/tools/update-nixpkgs
index f20acdb1fefbd63ee8a9255d9eae633f2b998b1f..3d0f18f7cc617a02c09cb8590874ea178100964e 100755
--- a/tools/update-nixpkgs
+++ b/tools/update-nixpkgs
@@ -10,7 +10,7 @@ from ps_tools import get_url_hash
 # We pass this to builtins.fetchTarball which only supports sha256
 HASH_TYPE = "sha256"
 
-DEFAULT_CHANNEL = "nixos-23.11"
+DEFAULT_CHANNEL = "nixos-24.05"
 CHANNEL_URL_TEMPLATE = "https://channels.nixos.org/{channel}/nixexprs.tar.xz"