diff --git a/home/modules/baseline.nix b/home/modules/baseline.nix
index f432d0a..500ffc6 100644
--- a/home/modules/baseline.nix
+++ b/home/modules/baseline.nix
@@ -68,8 +68,10 @@ in {
 
     programs.git = {
       enable = true;
-      userEmail = "fabian@posixlycorrect.com";
-      userName = "Fabian Montero";
+      settings.user = {
+        email = "fabian@posixlycorrect.com";
+        name = "Fabian Montero";
+      };
     };
 
     local = {
diff --git a/home/modules/gui/fonts.nix b/home/modules/gui/fonts.nix
index b74c094..9a72c65 100644
--- a/home/modules/gui/fonts.nix
+++ b/home/modules/gui/fonts.nix
@@ -34,7 +34,6 @@
     nerd-fonts.jetbrains-mono
     noto-fonts
     noto-fonts-cjk-sans
-    noto-fonts-emoji
-    noto-fonts-extra
+    noto-fonts-color-emoji
   ];
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index f6189a2..2e7eccd 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -6,7 +6,7 @@
 with prev.lib; let
   inherit (final) callPackage fetchpatch;
 in {
-  homepage = flakes.homepage.packages.${final.system}.default;
+  homepage = flakes.homepage.packages.${final.stdenv.hostPlatform.system}.default;
 
   override =
     {
diff --git a/sys/modules/baseline.nix b/sys/modules/baseline.nix
index fd594b7..d8827b0 100644
--- a/sys/modules/baseline.nix
+++ b/sys/modules/baseline.nix
@@ -58,8 +58,7 @@ in {
       nerd-fonts.jetbrains-mono
       noto-fonts
       noto-fonts-cjk-sans
-      noto-fonts-emoji
-      noto-fonts-extra
+      noto-fonts-color-emoji
       nerd-fonts.fira-code
       nerd-fonts.droid-sans-mono
     ];
@@ -72,6 +71,8 @@ in {
         enableNotifications = true;
       };
     };
+    
+    networking.useDHCP = false; # The global useDHCP flag is deprecated, therefore explicitly set to false here.
 
     programs.dconf.enable = true;
 
diff --git a/sys/modules/defaultDesktopPack.nix b/sys/modules/defaultDesktopPack.nix
index 1c231b8..34b1983 100644
--- a/sys/modules/defaultDesktopPack.nix
+++ b/sys/modules/defaultDesktopPack.nix
@@ -34,7 +34,6 @@ in {
 
     networking = {
       networkmanager.enable = true;
-      useDHCP = false; # The global useDHCP flag is deprecated, therefore explicitly set to false here.
     };
 
     services = {
diff --git a/sys/platforms/vps/default.nix b/sys/platforms/vps/default.nix
index 598fb34..7fb3266 100644
--- a/sys/platforms/vps/default.nix
+++ b/sys/platforms/vps/default.nix
@@ -111,9 +111,9 @@ with lib; {
   time.timeZone = "Europe/Amsterdam";
 
   systemd = {
-    extraConfig = ''
-      DefaultTimeoutStartSec=900s
-    '';
+    settings.Manager = {
+      DefaultTimeoutStartSec = "900s";
+    };
 
     network = let
       inherit (config.local.sys) nets;
@@ -185,7 +185,6 @@ with lib; {
 
     users.fabian = {
       imports = [
-        flakes.impermanence.nixosModules.home-manager.impermanence
         "${flakes.self}/home/platforms/fabian@vps"
         "${flakes.self}/home"
       ];
diff --git a/trivionomicon/flake.nix b/trivionomicon/flake.nix
index 2b53ebd..151c3d3 100644
--- a/trivionomicon/flake.nix
+++ b/trivionomicon/flake.nix
@@ -210,7 +210,7 @@
         }:
           flakes.nixpkgs.lib.makeOverridable flakes.nixpkgs.lib.nixosSystem {
             inherit pkgs;
-            inherit (pkgs) system;
+            inherit (pkgs.stdenv.hostPlatform) system;
 
             modules = [self.nixosModules.default] ++ modules;