diff --git a/flake.nix b/flake.nix
index aa361a3..5d52268 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,7 +12,7 @@
       # revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown";
       tartarus = nixpkgs.lib.nixosSystem rec {
         system = "x86_64-linux";
-        modules = [ ./configuration.nix ];
+        modules = [ ./hosts/tartarus/configuration.nix ];
         specialArgs = {
           pkgs-unstable = import nixpkgs-unstable {
             inherit system;
diff --git a/configuration.nix b/hosts/tartarus/configuration.nix
similarity index 96%
rename from configuration.nix
rename to hosts/tartarus/configuration.nix
index 749e898..7142864 100644
--- a/configuration.nix
+++ b/hosts/tartarus/configuration.nix
@@ -7,6 +7,7 @@
 {
   imports = [ # Include the results of the hardware scan.
     ./hardware-configuration.nix
+    ../../common/fonts.nix
   ];
 
   # Bootloader.
@@ -20,19 +21,6 @@
   # networking.proxy.default = "http://user:password@proxy:port/";
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
-  fonts.packages = with pkgs; [
-    noto-fonts
-    noto-fonts-cjk
-    noto-fonts-emoji
-    liberation_ttf
-    fira-code
-    fira-code-symbols
-    mplus-outline-fonts.githubRelease
-    dina-font
-    nerdfonts
-    proggyfonts
-  ];
-
   # Enable networking
   networking.networkmanager.enable = true;
 
diff --git a/hardware-configuration.nix b/hosts/tartarus/hardware-configuration.nix
similarity index 100%
rename from hardware-configuration.nix
rename to hosts/tartarus/hardware-configuration.nix