diff --git a/src/main/scala/li/cil/oc/common/init/Items.scala b/src/main/scala/li/cil/oc/common/init/Items.scala
index 0058ca7a9..aa10481e5 100644
--- a/src/main/scala/li/cil/oc/common/init/Items.scala
+++ b/src/main/scala/li/cil/oc/common/init/Items.scala
@@ -25,6 +25,7 @@ import li.cil.oc.common.item.traits.Delegate
 import li.cil.oc.common.item.traits.SimpleItem
 import li.cil.oc.common.recipe.Recipes
 import li.cil.oc.integration.Mods
+import li.cil.oc.server.machine.luac.LuaStateFactory
 import net.minecraft.block.Block
 import net.minecraft.creativetab.CreativeTabs
 import net.minecraft.entity.player.EntityPlayer
@@ -286,7 +287,7 @@ object Items extends ItemAPI {
       Option(safeGetStack(Constants.ItemName.RedstoneCardTier2)),
       Option(safeGetStack(Constants.ItemName.WirelessNetworkCardTier2)),
 
-      LuaStateFactory.setDefaultArch(safeGetStack(Constants.ItemName.CPUTier3)),
+      Option(LuaStateFactory.setDefaultArch(safeGetStack(Constants.ItemName.CPUTier3))),
       Option(safeGetStack(Constants.ItemName.RAMTier6)),
       Option(safeGetStack(Constants.ItemName.RAMTier6)),
 
diff --git a/src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala b/src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala
index a1c6a501f..e167a61da 100644
--- a/src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala
+++ b/src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala
@@ -6,14 +6,13 @@ import li.cil.oc.Constants
 import li.cil.oc.Settings
 import li.cil.oc.api
 import li.cil.oc.api.detail.ItemInfo
-import li.cil.oc.api.machine.Architecture
 import li.cil.oc.common.item.data.DroneData
 import li.cil.oc.common.item.data.MicrocontrollerData
 import li.cil.oc.common.item.data.PrintData
 import li.cil.oc.common.item.data.RobotData
 import li.cil.oc.common.item.data.TabletData
 import li.cil.oc.integration.Mods
-import li.cil.oc.server.machine.luac.{LuaStateFactory, NativeLua53Architecture}
+import li.cil.oc.server.machine.luac.LuaStateFactory
 import li.cil.oc.util.Color
 import li.cil.oc.util.ExtendedNBT._
 import li.cil.oc.util.SideTracker
@@ -82,7 +81,7 @@ object ExtendedRecipe {
     }
 
     if (cpus.contains(craftedItemName)) {
-      LuaStateFactory.setDefaultArch(craftedItemName)
+      LuaStateFactory.setDefaultArch(craftedStack)
     }
 
     if (craftedItemName == floppy || hdds.contains(craftedItemName)) {
diff --git a/src/main/scala/li/cil/oc/server/command/SpawnComputerCommand.scala b/src/main/scala/li/cil/oc/server/command/SpawnComputerCommand.scala
index 62aa3a804..64bd1c22c 100644
--- a/src/main/scala/li/cil/oc/server/command/SpawnComputerCommand.scala
+++ b/src/main/scala/li/cil/oc/server/command/SpawnComputerCommand.scala
@@ -77,7 +77,7 @@ object SpawnComputerCommand extends SimpleCommand("oc_spawnComputer") {
             api.Network.joinOrCreateNetwork(world.getTileEntity(casePos))
 
             val apu = api.Items.get(Constants.ItemName.APUCreative).createItemStack(1)
-            LuaStateFactory.setDefaultArch(craftedItemName)
+            LuaStateFactory.setDefaultArch(apu)
 
             InventoryUtils.insertIntoInventoryAt(apu, casePos)
             InventoryUtils.insertIntoInventoryAt(api.Items.get(Constants.ItemName.RAMTier6).createItemStack(2), casePos)
diff --git a/src/main/scala/li/cil/oc/server/machine/luac/LuaStateFactory.scala b/src/main/scala/li/cil/oc/server/machine/luac/LuaStateFactory.scala
index 039805536..6789e7461 100644
--- a/src/main/scala/li/cil/oc/server/machine/luac/LuaStateFactory.scala
+++ b/src/main/scala/li/cil/oc/server/machine/luac/LuaStateFactory.scala
@@ -10,10 +10,13 @@ import com.google.common.base.Strings
 import com.google.common.io.PatternFilenameFilter
 import li.cil.oc.OpenComputers
 import li.cil.oc.Settings
+import li.cil.oc.api
+import li.cil.oc.api.machine.Architecture
 import li.cil.oc.server.machine.Machine
 import li.cil.oc.util.ExtendedLuaState._
 import li.cil.repack.com.naef.jnlua
 import li.cil.repack.com.naef.jnlua.NativeSupport.Loader
+import net.minecraft.item.ItemStack
 import org.apache.commons.lang3.SystemUtils
 
 import scala.util.Random