diff --git a/flake.nix b/flake.nix
index 4afed9c..d40d660 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,13 +58,13 @@
 
       overlay-unstable = final: prev: {
         unstable = import nixpkgs-unstable {
-          inherit (prev) system;
+          system = prev.stdenv.hostPlatform.system;
           config.allowUnfree = true;
         };
       };
 
       overlay-browser-previews = final: prev: {
-        browser-previews = browser-previews.packages.${prev.system};
+        browser-previews = browser-previews.packages.${prev.stdenv.hostPlatform.system};
       };
 
       mkHost =
diff --git a/home/programs/server.nix b/home/programs/server.nix
index b3744c2..fa243cf 100644
--- a/home/programs/server.nix
+++ b/home/programs/server.nix
@@ -347,8 +347,12 @@
 
     git = {
       enable = true;
-      userEmail = "petru@paler.net";
-      userName = "Petru Paler";
+      settings = {
+        user = {
+          email = "petru@paler.net";
+          name = "Petru Paler";
+        };
+      };
     };
 
     home-manager = {