diff --git a/flake.lock b/flake.lock
index 087431b..89834cd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730448474,
-        "narHash": "sha256-qE/cYKBhzxHMtKtLK3hlSR3uzO1pWPGLrBuQK7r0CHc=",
+        "lastModified": 1733570843,
+        "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "683d0c4cd1102dcccfa3f835565378c7f3cbe05e",
+        "rev": "a35b08d09efda83625bef267eb24347b446c80b8",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730490306,
-        "narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=",
+        "lastModified": 1734344598,
+        "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1743615b61c7285976f85b303a36cdf88a556503",
+        "rev": "83ecd50915a09dca928971139d3a102377a8d242",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1728031945,
-        "narHash": "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=",
+        "lastModified": 1734338723,
+        "narHash": "sha256-BpJs2QnVwdE4Btsx2BcBmdsq86H7QJYv2GmoOkr1ii4=",
         "owner": "Mic92",
         "repo": "nix-ld",
-        "rev": "4524c512e8729ccb5a1b9239d01e1474cbf074a2",
+        "rev": "911665df070e3d6c970e5a248fc4a38550bd5689",
         "type": "github"
       },
       "original": {
@@ -77,11 +77,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727634051,
-        "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
+        "lastModified": 1733015953,
+        "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
+        "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1726243404,
-        "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
+        "lastModified": 1734424634,
+        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
+        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 97fe803..1332fc5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,8 +37,7 @@
         hostname = "sephiroth";
       };
       modules = [
-        ./modules/common/core.nix
-        ./modules/common/users.nix
+        ./modules/common
         ./modules/machine/sephiroth
 
         home-manager.darwinModules.home-manager
@@ -61,8 +60,7 @@
       modules = [
         nix-flatpak.nixosModules.nix-flatpak
         nix-ld.nixosModules.nix-ld
-        ./modules/common/core.nix
-        ./modules/common/users.nix
+        ./modules/common
         ./modules/machine/cloud
 
         home-manager.nixosModules.home-manager
diff --git a/modules/common/default.nix b/modules/common/default.nix
new file mode 100644
index 0000000..18cfde2
--- /dev/null
+++ b/modules/common/default.nix
@@ -0,0 +1,7 @@
+{...}: {
+  imports = [
+    ./core.nix
+    ./fonts.nix
+    ./users.nix
+  ];
+}
diff --git a/modules/common/fonts.nix b/modules/common/fonts.nix
new file mode 100644
index 0000000..57e2517
--- /dev/null
+++ b/modules/common/fonts.nix
@@ -0,0 +1,14 @@
+{
+  pkgs,
+  lib,
+}: {
+  fonts.packages = with pkgs;
+    [
+      noto-fonts
+      noto-fonts-emoji
+      liberation_ttf
+      noto-fonts-cjk
+      monaspace
+    ]
+    ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
+}
diff --git a/modules/machine/cloud/configuration.nix b/modules/machine/cloud/configuration.nix
index cf41780..43b1870 100644
--- a/modules/machine/cloud/configuration.nix
+++ b/modules/machine/cloud/configuration.nix
@@ -48,16 +48,6 @@
     patchelf
   ];
 
-  # Install system-wide fonts
-  fonts.packages = with pkgs; [
-    noto-fonts
-    noto-fonts-cjk
-    noto-fonts-emoji
-    liberation_ttf
-    monaspace
-    nerdfonts
-  ];
-
   # Set the EDITOR global environment variable to neovim
   environment.variables.EDITOR = "nvim";
 
diff --git a/modules/machine/cloud/default.nix b/modules/machine/cloud/default.nix
new file mode 100644
index 0000000..187a110
--- /dev/null
+++ b/modules/machine/cloud/default.nix
@@ -0,0 +1,6 @@
+{...}: {
+  imports = [
+    ./configuration.nix
+    ./hardware-configuration.nix
+  ];
+}
diff --git a/modules/machine/sephiroth/configuration.nix b/modules/machine/sephiroth/configuration.nix
index e9c2dae..bb08290 100644
--- a/modules/machine/sephiroth/configuration.nix
+++ b/modules/machine/sephiroth/configuration.nix
@@ -168,9 +168,9 @@
   system.stateVersion = 5;
 
   containers.podman = {
-    enable = true;
-    dockerCompat = false;
+    enable = false;
     extraPackages = with pkgs; [
+      podman
       docker-credential-helpers
       cosign
       crane
diff --git a/modules/machine/sephiroth/default.nix b/modules/machine/sephiroth/default.nix
new file mode 100644
index 0000000..fcb07f3
--- /dev/null
+++ b/modules/machine/sephiroth/default.nix
@@ -0,0 +1,6 @@
+{...}: {
+  imports = [
+    ./apps.nix
+    ./configuration.nix
+  ];
+}