diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix
deleted file mode 100644
index 986f7da..0000000
--- a/hosts/dnsc-machine/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./hardware-configuration.nix
-  ];
-
-  networking.hostName = "dnsc-machine";
-  environment.systemPackages = [ ];
-  system.stateVersion = "25.05";
-}
diff --git a/hosts/dnsc-machine/hardware-configuration.nix b/hosts/dnsc-machine/hardware-configuration.nix
deleted file mode 100644
index 0e059e0..0000000
--- a/hosts/dnsc-machine/hardware-configuration.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-# Do not modify this file!  It was generated by 'nixos-generate-config'
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/30277f94-8b7b-4e91-8438-6815170edfdd";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/4DC9-7AB7";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/9b7564e7-2deb-4432-a4fc-d18d21ef2d11"; }
-    ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp42s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp45s0f3u3u4.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/modules/base.nix b/modules/base.nix
deleted file mode 100644
index 1307d8b..0000000
--- a/modules/base.nix
+++ /dev/null
@@ -1,117 +0,0 @@
-{ config, ... }:
-let
-  username = config.flake.globalConfig.username;
-in
-{
-  flake.modules.darwin.base = {
-    system = {
-      primaryUser = username;
-      stateVersion = 5;
-      activationScripts.postActivation.text = ''
-        /System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u
-      '';
-
-      nix.enable = false;
-
-      defaults = {
-        NSGlobalDomain."com.apple.swipescrolldirection" = false;
-
-        dock = {
-          autohide = true;
-          autohide-delay = 0.01;
-          autohide-time-modifier = 0.01;
-          expose-group-apps = true;
-          launchanim = false;
-          minimize-to-application = true;
-          orientation = "right";
-          show-recents = false;
-          persistent-apps = [
-            "/Applications/Helium.app"
-            "/Applications/Ghostty.app"
-            "/System/Applications/System Settings.app/"
-          ];
-          persistent-others = [
-            "/Users/${username}/Downloads"
-          ];
-        };
-
-        finder = {
-          AppleShowAllExtensions = true;
-          CreateDesktop = false;
-          FXEnableExtensionChangeWarning = false;
-          FXPreferredViewStyle = "clmv";
-          ShowPathbar = true;
-          ShowStatusBar = true;
-        };
-
-        loginwindow = {
-          LoginwindowText = "(λ) powered by nix-darwin";
-        };
-
-        menuExtraClock = {
-          Show24Hour = true;
-          ShowDate = 0;
-        };
-
-        screencapture = {
-          location = "/Users/${username}/Downloads";
-          target = "file";
-        };
-
-        spaces.spans-displays = false;
-      };
-    };
-
-    security.pam.services.sudo_local.touchIdAuth = true;
-  };
-
-  flake.modules.nixos.base =
-    { pkgs, ... }:
-    {
-      boot.loader = {
-        systemd-boot.enable = true;
-        efi.canTouchEfiVariables = true;
-      };
-
-      networking.networkmanager.enable = true;
-
-      time.timeZone = "Europe/Berlin";
-      i18n = {
-        defaultLocale = "en_US.UTF-8";
-        extraLocaleSettings = {
-          LC_ADDRESS = "de_DE.UTF-8";
-          LC_IDENTIFICATION = "de_DE.UTF-8";
-          LC_MEASUREMENT = "de_DE.UTF-8";
-          LC_MONETARY = "de_DE.UTF-8";
-          LC_NAME = "de_DE.UTF-8";
-          LC_NUMERIC = "de_DE.UTF-8";
-          LC_PAPER = "de_DE.UTF-8";
-          LC_TELEPHONE = "de_DE.UTF-8";
-          LC_TIME = "de_DE.UTF-8";
-        };
-      };
-
-      security.sudo.enable = true;
-
-      programs.gnupg.agent = {
-        enable = true;
-        enableSSHSupport = true;
-      };
-      programs.mtr.enable = true;
-
-      services.xserver.xkb.layout = "eu";
-      services.openssh.enable = true;
-      services.udisks2.enable = true;
-      services.udev.packages = with pkgs; [
-        vial
-      ];
-
-      users.users."${username}" = {
-        isNormalUser = true;
-        extraGroups = [
-          "networkmanager"
-          "wheel"
-        ];
-      };
-    };
-}
diff --git a/modules/hosts/dnsc-machine.nix b/modules/hosts/dnsc-machine.nix
index f65631b..fcfda99 100644
--- a/modules/hosts/dnsc-machine.nix
+++ b/modules/hosts/dnsc-machine.nix
@@ -1,11 +1,11 @@
-{ inputs, ... }:
+{ inputs, config, ... }:
 
 {
   flake.nixosConfigurations.dnsc-machine = inputs.nixpkgs.lib.nixosSystem {
     system = "x86_64-linux";
-    modules = with inputs.self.modules.nixos; [
+    modules = with config.flake.modules.nixos; [
       base
-      "${inputs.self}/hosts/dnsc-machine/default.nix"
+      dnsc-machine
     ];
   };
 }