diff --git a/system/virtual/configuration.nix b/system/virtual/configuration.nix
deleted file mode 100644
index 166411b..0000000
--- a/system/virtual/configuration.nix
+++ /dev/null
@@ -1,121 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-{
-  config,
-  pkgs,
-  ...
-}: {
-  imports = [
-    # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-  ];
-
-  hardware.opengl.enable = true;
-
-  # Make ready for nix flakes
-  nix.package = pkgs.nixVersions.stable;
-  nix.extraOptions = ''
-    experimental-features = nix-command flakes
-  '';
-
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  # networking.hostName = "nixos"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Set your time zone.
-  time.timeZone = "America/Los_Angeles";
-
-  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
-  # Per-interface useDHCP will be mandatory in the future, so this generated config
-  # replicates the default behaviour.
-  networking.useDHCP = false;
-  networking.interfaces.enp1s0.useDHCP = true;
-  networking.hostName = "virtual";
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Select internationalisation properties.
-  # i18n.defaultLocale = "en_US.UTF-8";
-  # console = {
-  #   font = "Lat2-Terminus16";
-  #   keyMap = "us";
-  # };
-
-  # Enable the X11 windowing system.
-  # services.xserver.enable = true;
-
-  # Configure keymap in X11
-  # services.xserver.layout = "us";
-  # services.xserver.xkbOptions = "eurosign:e";
-
-  # Enable CUPS to print documents.
-  # services.printing.enable = true;
-
-  # Enable sound.
-  # sound.enable = true;
-  # hardware.pulseaudio.enable = true;
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.alejandro = {
-    isNormalUser = true;
-    extraGroups = ["wheel"]; # Enable ‘sudo’ for the user.
-    initialPassword = "test";
-    shell = pkgs.zsh;
-  };
-
-  fonts.fonts = with pkgs; [
-    (nerdfonts.override {fonts = ["Hack"];})
-  ];
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-    wget
-    git
-    ripgrep
-    killall
-    #   firefox
-  ];
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  services.spice-vdagentd.enable = true;
-
-  # Enable the OpenSSH daemon.
-  services.openssh = {
-    enable = true;
-    passwordAuthentication = true;
-  };
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "22.05"; # Did you read the comment?
-}
diff --git a/system/virtual/hardware-configuration.nix b/system/virtual/hardware-configuration.nix
deleted file mode 100644
index 3507739..0000000
--- a/system/virtual/hardware-configuration.nix
+++ /dev/null
@@ -1,34 +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 + "/profiles/qemu-guest.nix")
-  ];
-
-  boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-intel"];
-  boot.extraModulePackages = [];
-
-  hardware.opengl.enable = true;
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/8468529a-7215-4da3-af26-0c7f859e77f4";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/BBE3-1963";
-    fsType = "vfat";
-  };
-
-  swapDevices = [];
-
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/system/carbon/configuration.nix b/systems/x86_64-linux/carbon/configuration.nix
similarity index 100%
rename from system/carbon/configuration.nix
rename to systems/x86_64-linux/carbon/configuration.nix
diff --git a/system/carbon/hardware-configuration-zfs.nix b/systems/x86_64-linux/carbon/hardware-configuration-zfs.nix
similarity index 100%
rename from system/carbon/hardware-configuration-zfs.nix
rename to systems/x86_64-linux/carbon/hardware-configuration-zfs.nix
diff --git a/system/carbon/vpn.nix b/systems/x86_64-linux/carbon/vpn.nix
similarity index 100%
rename from system/carbon/vpn.nix
rename to systems/x86_64-linux/carbon/vpn.nix
diff --git a/system/carbon/zfs.nix b/systems/x86_64-linux/carbon/zfs.nix
similarity index 100%
rename from system/carbon/zfs.nix
rename to systems/x86_64-linux/carbon/zfs.nix
diff --git a/system/gospel/configuration.nix b/systems/x86_64-linux/gospel/configuration.nix
similarity index 100%
rename from system/gospel/configuration.nix
rename to systems/x86_64-linux/gospel/configuration.nix
diff --git a/system/gospel/hardware-configuration.nix b/systems/x86_64-linux/gospel/hardware-configuration.nix
similarity index 100%
rename from system/gospel/hardware-configuration.nix
rename to systems/x86_64-linux/gospel/hardware-configuration.nix
diff --git a/system/gospel/vpn.nix b/systems/x86_64-linux/gospel/vpn.nix
similarity index 100%
rename from system/gospel/vpn.nix
rename to systems/x86_64-linux/gospel/vpn.nix
diff --git a/system/gospel/zfs.nix b/systems/x86_64-linux/gospel/zfs.nix
similarity index 100%
rename from system/gospel/zfs.nix
rename to systems/x86_64-linux/gospel/zfs.nix