diff --git a/src/common/Data.h b/src/common/Data.h
index ef2c671b7..a4d2413fe 100644
--- a/src/common/Data.h
+++ b/src/common/Data.h
@@ -38,6 +38,8 @@ class Data : public Object
 {
 public:
 
+	static love::Type type;
+
 	/**
 	 * Destructor.
 	 **/
diff --git a/src/common/Module.cpp b/src/common/Module.cpp
index 539804b0b..050da2621 100644
--- a/src/common/Module.cpp
+++ b/src/common/Module.cpp
@@ -58,6 +58,7 @@ namespace
 namespace love
 {
 
+love::Type Module::type(&Object::type);
 Module *Module::instances[] = {};
 
 Module::~Module()
diff --git a/src/common/Module.h b/src/common/Module.h
index 25fc09960..d870d23d1 100644
--- a/src/common/Module.h
+++ b/src/common/Module.h
@@ -34,6 +34,8 @@ class Module : public Object
 {
 public:
 
+	static love::Type type;
+
 	enum ModuleType
 	{
 		M_AUDIO,
diff --git a/src/common/Object.cpp b/src/common/Object.cpp
index 1da5a7aa6..aef13aff5 100644
--- a/src/common/Object.cpp
+++ b/src/common/Object.cpp
@@ -24,6 +24,8 @@
 namespace love
 {
 
+love::Type Object::type({});
+
 Object::Object()
 	: count(1)
 {
diff --git a/src/common/Object.h b/src/common/Object.h
index 705623291..f64c1c0ea 100644
--- a/src/common/Object.h
+++ b/src/common/Object.h
@@ -22,6 +22,7 @@
 #define LOVE_OBJECT_H
 
 #include <atomic>
+#include "types.h"
 
 namespace love
 {
@@ -38,6 +39,8 @@ class Object
 {
 public:
 
+	static love::Type type;
+
 	/**
 	 * Constructor. Sets reference count to one.
 	 **/
diff --git a/src/common/Stream.h b/src/common/Stream.h
index 4b9b1db29..2b69144e3 100644
--- a/src/common/Stream.h
+++ b/src/common/Stream.h
@@ -31,6 +31,8 @@ namespace love
 class Stream : public Object
 {
 public:
+	static love::Type type;
+
 	virtual ~Stream() {}
 
 	// getData and getSize are assumed to talk about
diff --git a/src/common/Variant.cpp b/src/common/Variant.cpp
index e43cc7a72..1ca970f01 100644
--- a/src/common/Variant.cpp
+++ b/src/common/Variant.cpp
@@ -24,19 +24,19 @@
 namespace love
 {
 
-static love::Type extractudatatype(lua_State *L, int idx)
+static love::Type *extractudatatype(lua_State *L, int idx)
 {
 	Proxy *u = (Proxy *)lua_touserdata(L, idx);
 
-	if (u == nullptr || u->type <= INVALID_ID || u->type >= TYPE_MAX_ENUM)
-		return INVALID_ID;
+	if (u == nullptr || u->type == nullptr)
+		return nullptr;
 
 	// We could get rid of the dynamic_cast for more performance, but it would
 	// be less safe...
 	if (dynamic_cast<Object *>(u->object) != nullptr)
 		return u->type;
 
-	return INVALID_ID;
+	return nullptr;
 }
 
 Variant::Variant()
@@ -77,11 +77,11 @@ Variant::Variant(void *userdata)
 	data.userdata = userdata;
 }
 
-Variant::Variant(love::Type udatatype, void *userdata)
+Variant::Variant(love::Type *udatatype, void *userdata)
 	: type(FUSERDATA)
 	, udatatype(udatatype)
 {
-	if (udatatype != INVALID_ID)
+	if (udatatype != nullptr)
 	{
 		Proxy *p = (Proxy *) userdata;
 		data.userdata = p->object;
@@ -243,8 +243,8 @@ void Variant::toLua(lua_State *L) const
 		lua_pushlightuserdata(L, data.userdata);
 		break;
 	case FUSERDATA:
-		if (udatatype != INVALID_ID)
-			luax_pushtype(L, udatatype, (love::Object *) data.userdata);
+		if (udatatype != nullptr)
+			luax_pushtype(L, *udatatype, (love::Object *) data.userdata);
 		else
 			lua_pushlightuserdata(L, data.userdata);
 		// I know this is not the same
diff --git a/src/common/Variant.h b/src/common/Variant.h
index 87e5d3575..ecea5b95a 100644
--- a/src/common/Variant.h
+++ b/src/common/Variant.h
@@ -53,7 +53,7 @@ public:
 	Variant(double number);
 	Variant(const char *string, size_t len);
 	Variant(void *userdata);
-	Variant(love::Type udatatype, void *userdata);
+	Variant(love::Type *udatatype, void *userdata);
 	Variant(std::vector<std::pair<Variant, Variant>> *table);
 	Variant(const Variant &v);
 	Variant(Variant &&v);
@@ -101,7 +101,7 @@ private:
 	static const int MAX_SMALL_STRING_LENGTH = 15;
 
 	Type type;
-	love::Type udatatype;
+	love::Type *udatatype;
 
 	union Data
 	{
diff --git a/src/common/runtime.cpp b/src/common/runtime.cpp
index 477831bf3..40290da14 100644
--- a/src/common/runtime.cpp
+++ b/src/common/runtime.cpp
@@ -67,8 +67,9 @@ static int w__type(lua_State *L)
 static int w__typeOf(lua_State *L)
 {
 	Proxy *p = (Proxy *)lua_touserdata(L, 1);
-	Type t = luax_type(L, 2);
-	luax_pushboolean(L, typeFlags[p->type][t]);
+	//Type t = luax_type(L, 2);
+	love::Type &t = Object::type; // FIXME
+	luax_pushboolean(L, p->type->isa(t));
 	return 1;
 }
 
@@ -248,7 +249,7 @@ int luax_require(lua_State *L, const char *name)
 
 int luax_register_module(lua_State *L, const WrappedModule &m)
 {
-	love::addTypeName(m.type, m.name);
+	love::addTypeName(m.type->getId(), m.name);
 
 	// Put a reference to the C++ module in Lua.
 	luax_insistregistry(L, REGISTRY_MODULES);
@@ -304,9 +305,9 @@ int luax_preload(lua_State *L, lua_CFunction f, const char *name)
 	return 0;
 }
 
-int luax_register_type(lua_State *L, love::Type type, const char *name, ...)
+int luax_register_type(lua_State *L, love::Type &type, const char *name, ...)
 {
-	love::addTypeName(type, name);
+	love::addTypeName(type.getId(), name);
 
 	// Get the place for storing and re-using instantiated love types.
 	luax_getregistry(L, REGISTRY_OBJECTS);
@@ -375,10 +376,10 @@ int luax_register_type(lua_State *L, love::Type type, const char *name, ...)
 	return 0;
 }
 
-void luax_gettypemetatable(lua_State *L, love::Type type)
+void luax_gettypemetatable(lua_State *L, love::Type &type)
 {
 	const char *name = nullptr;
-	if (getTypeName(type, name))
+	if (getTypeName(type.getId(), name))
 		lua_getfield(L, LUA_REGISTRYINDEX, name);
 	else
 		lua_pushnil(L);
@@ -437,23 +438,23 @@ int luax_register_searcher(lua_State *L, lua_CFunction f, int pos)
 	return 0;
 }
 
-void luax_rawnewtype(lua_State *L, love::Type type, love::Object *object)
+void luax_rawnewtype(lua_State *L, love::Type &type, love::Object *object)
 {
 	Proxy *u = (Proxy *)lua_newuserdata(L, sizeof(Proxy));
 
 	object->retain();
 
 	u->object = object;
-	u->type = type;
+	u->type = &type;
 
 	const char *name = "Invalid";
-	getTypeName(type, name);
+	getTypeName(type.getId(), name);
 
 	luaL_newmetatable(L, name);
 	lua_setmetatable(L, -2);
 }
 
-void luax_pushtype(lua_State *L, love::Type type, love::Object *object)
+void luax_pushtype(lua_State *L, love::Type &type, love::Object *object)
 {
 	if (object == nullptr)
 	{
@@ -495,15 +496,15 @@ void luax_pushtype(lua_State *L, love::Type type, love::Object *object)
 	// Keep the Proxy userdata on the stack.
 }
 
-bool luax_istype(lua_State *L, int idx, love::Type type)
+bool luax_istype(lua_State *L, int idx, love::Type &type)
 {
 	if (lua_type(L, idx) != LUA_TUSERDATA)
 		return false;
 
 	Proxy *p = (Proxy *) lua_touserdata(L, idx);
 
-	if (p->type > INVALID_ID && p->type < TYPE_MAX_ENUM)
-		return typeFlags[p->type][type];
+	if (p->type != nullptr)
+		return p->type->isa(type);
 	else
 		return false;
 }
@@ -717,7 +718,7 @@ extern "C" int luax_typerror(lua_State *L, int narg, const char *tname)
 
 			// Non-love userdata might have a type metamethod which doesn't
 			// describe its type properly, so we only use it for love types.
-			love::Type t;
+			uint32_t t;
 			if (!love::getTypeName(argtname, t))
 				argtname = 0;
 		}
@@ -752,9 +753,9 @@ void luax_register(lua_State *L, const char *name, const luaL_Reg *l)
 	}
 }
 
-Type luax_type(lua_State *L, int idx)
+uint32_t luax_type(lua_State *L, int idx)
 {
-	Type t = INVALID_ID;
+	uint32_t t = 0;
 	getTypeName(luaL_checkstring(L, idx), t);
 	return t;
 }
diff --git a/src/common/runtime.h b/src/common/runtime.h
index 036c5764f..08c6080bf 100644
--- a/src/common/runtime.h
+++ b/src/common/runtime.h
@@ -62,7 +62,7 @@ enum Registry
 struct Proxy
 {
 	// Holds type information (see types.h).
-	Type type;
+	love::Type *type;
 
 	// Pointer to the actual object.
 	Object *object;
@@ -80,7 +80,7 @@ struct WrappedModule
 	const char *name;
 
 	// The type of this module.
-	love::Type type;
+	love::Type *type;
 
 	// The functions of the module (last element {0,0}).
 	const luaL_Reg *functions;
@@ -250,12 +250,12 @@ int luax_preload(lua_State *L, lua_CFunction f, const char *name);
  * @param name The type's human-readable name
  * @param ... The list of lists of member functions for the type. (of type luaL_Reg*)
  **/
-int luax_register_type(lua_State *L, love::Type type, const char *name, ...);
+int luax_register_type(lua_State *L, love::Type &type, const char *name, ...);
 
 /**
  * Pushes the metatable of the specified type onto the stack.
 **/
-void luax_gettypemetatable(lua_State *L, love::Type type);
+void luax_gettypemetatable(lua_State *L, love::Type &type);
 
 /**
  * Do a table.insert from C
@@ -283,7 +283,7 @@ int luax_register_searcher(lua_State *L, lua_CFunction f, int pos = -1);
  * @param type The type information of the object.
  * @param object The pointer to the actual object.
  **/
-void luax_pushtype(lua_State *L, const love::Type type, love::Object *object);
+void luax_pushtype(lua_State *L, love::Type &type, love::Object *object);
 
 /**
  * Creates a new Lua representation of the given object *without* checking if it
@@ -296,7 +296,7 @@ void luax_pushtype(lua_State *L, const love::Type type, love::Object *object);
  * @param type The type information of the object.
  * @param object The pointer to the actual object.
  **/
-void luax_rawnewtype(lua_State *L, love::Type type, love::Object *object);
+void luax_rawnewtype(lua_State *L, love::Type &type, love::Object *object);
 
 /**
  * Checks whether the value at idx is a certain type.
@@ -305,7 +305,7 @@ void luax_rawnewtype(lua_State *L, love::Type type, love::Object *object);
  * @param type The type to check for.
  * @return True if the value is Proxy of the specified type, false otherwise.
  **/
-bool luax_istype(lua_State *L, int idx, love::Type type);
+bool luax_istype(lua_State *L, int idx, love::Type &type);
 
 /**
  * Gets the function love.module.function and puts it on top of the stack (alone). If the
@@ -434,21 +434,21 @@ extern "C" { // Called by enet and luasocket
  * @param type The type bit.
  **/
 template <typename T>
-T *luax_checktype(lua_State *L, int idx, love::Type type)
+T *luax_checktype(lua_State *L, int idx, love::Type &type)
 {
 	if (lua_type(L, idx) != LUA_TUSERDATA)
 	{
 		const char *name = "Invalid";
-		getTypeName(type, name);
+		getTypeName(type.getId(), name);
 		luax_typerror(L, idx, name);
 	}
 
 	Proxy *u = (Proxy *)lua_touserdata(L, idx);
 
-	if (u->type <= INVALID_ID || u->type >= TYPE_MAX_ENUM || !typeFlags[u->type][type])
+	if (u->type == nullptr || !u->type->isa(type))
 	{
 		const char *name = "Invalid";
-		getTypeName(type, name);
+		getTypeName(type.getId(), name);
 		luax_typerror(L, idx, name);
 	}
 
@@ -459,10 +459,10 @@ T *luax_checktype(lua_State *L, int idx, love::Type type)
 }
 
 template <typename T>
-T *luax_getmodule(lua_State *L, love::Type type)
+T *luax_getmodule(lua_State *L, love::Type &type)
 {
 	const char *name = "Invalid";
-	getTypeName(type, name);
+	getTypeName(type.getId(), name);
 
 	luax_insistregistry(L, REGISTRY_MODULES);
 	lua_getfield(L, -1, name);
@@ -472,7 +472,7 @@ T *luax_getmodule(lua_State *L, love::Type type)
 
 	Proxy *u = (Proxy *)lua_touserdata(L, -1);
 
-	if (u->type <= INVALID_ID || u->type >= TYPE_MAX_ENUM || !typeFlags[u->type][type])
+	if (u->type == nullptr || !u->type->isa(type))
 		luaL_error(L, "Incorrect module %s", name);
 
 	lua_pop(L, 2);
@@ -481,10 +481,10 @@ T *luax_getmodule(lua_State *L, love::Type type)
 }
 
 template <typename T>
-T *luax_optmodule(lua_State *L, love::Type type)
+T *luax_optmodule(lua_State *L, love::Type &type)
 {
 	const char *name = "Invalid";
-	getTypeName(type, name);
+	getTypeName(type.getId(), name);
 
 	luax_insistregistry(L, REGISTRY_MODULES);
 	lua_getfield(L, -1, name);
@@ -497,7 +497,7 @@ T *luax_optmodule(lua_State *L, love::Type type)
 
 	Proxy *u = (Proxy *)lua_touserdata(L, -1);
 
-	if (!typeFlags[u->type][type])
+	if (!u->type->isa(type))
 		luaL_error(L, "Incorrect module %s", name);
 
 	lua_pop(L, 2);
@@ -524,7 +524,7 @@ T *luax_totype(lua_State *L, int idx, love::Type /*type*/)
 	return o;
 }
 
-Type luax_type(lua_State *L, int idx);
+uint32_t luax_type(lua_State *L, int idx);
 
 /**
  * Converts any exceptions thrown by the passed lambda function into a Lua error.
diff --git a/src/common/types.cpp b/src/common/types.cpp
index 4bb44ecce..d6698146a 100644
--- a/src/common/types.cpp
+++ b/src/common/types.cpp
@@ -24,120 +24,78 @@
 namespace love
 {
 
-static const TypeBits *createTypeFlags()
-{
-	static TypeBits b[TYPE_MAX_ENUM];
-	TypeBits one = TypeBits(1);
+static StringMap<uint32_t, love::Type::MAX_TYPES> types(nullptr, 0);
 
-	b[INVALID_ID] = one << INVALID_ID;
-
-	b[OBJECT_ID] = one << OBJECT_ID;
-	b[DATA_ID] = (one << DATA_ID) | b[OBJECT_ID];
-	b[MODULE_ID] = (one << MODULE_ID) | b[OBJECT_ID];
-	b[STREAM_ID] = (one << STREAM_ID) | b[OBJECT_ID];
-
-	// Filesystem.
-	b[FILESYSTEM_FILE_ID] = (one << FILESYSTEM_FILE_ID) | b[OBJECT_ID];
-	b[FILESYSTEM_DROPPED_FILE_ID] = (one << FILESYSTEM_DROPPED_FILE_ID) | b[FILESYSTEM_FILE_ID];
-	b[FILESYSTEM_FILE_DATA_ID] = (one << FILESYSTEM_FILE_DATA_ID) | b[DATA_ID];
-
-	b[FONT_GLYPH_DATA_ID] = (one << FONT_GLYPH_DATA_ID) | b[DATA_ID];
-	b[FONT_RASTERIZER_ID] = (one << FONT_RASTERIZER_ID) | b[OBJECT_ID];
-
-	// Graphics.
-	b[GRAPHICS_DRAWABLE_ID] = (one << GRAPHICS_DRAWABLE_ID) | b[OBJECT_ID];
-	b[GRAPHICS_TEXTURE_ID] = (one << GRAPHICS_TEXTURE_ID) | b[GRAPHICS_DRAWABLE_ID];
-	b[GRAPHICS_IMAGE_ID] = (one << GRAPHICS_IMAGE_ID) | b[GRAPHICS_TEXTURE_ID];
-	b[GRAPHICS_QUAD_ID] = (one << GRAPHICS_QUAD_ID) | b[OBJECT_ID];
-	b[GRAPHICS_FONT_ID] = (one << GRAPHICS_FONT_ID) | b[OBJECT_ID];
-	b[GRAPHICS_PARTICLE_SYSTEM_ID] = (one << GRAPHICS_PARTICLE_SYSTEM_ID) | b[GRAPHICS_DRAWABLE_ID];
-	b[GRAPHICS_SPRITE_BATCH_ID] = (one << GRAPHICS_SPRITE_BATCH_ID) | b[GRAPHICS_DRAWABLE_ID];
-	b[GRAPHICS_CANVAS_ID] = (one << GRAPHICS_CANVAS_ID) | b[GRAPHICS_TEXTURE_ID];
-	b[GRAPHICS_SHADER_ID] = (one << GRAPHICS_SHADER_ID) | b[OBJECT_ID];
-	b[GRAPHICS_MESH_ID] = (one << GRAPHICS_MESH_ID) | b[GRAPHICS_DRAWABLE_ID];
-	b[GRAPHICS_TEXT_ID] = (one << GRAPHICS_TEXT_ID) | b[GRAPHICS_DRAWABLE_ID];
-	b[GRAPHICS_VIDEO_ID] = (one << GRAPHICS_VIDEO_ID) | b[GRAPHICS_DRAWABLE_ID];
-
-	// Image.
-	b[IMAGE_IMAGE_DATA_ID] = (one << IMAGE_IMAGE_DATA_ID) | b[DATA_ID];
-	b[IMAGE_COMPRESSED_IMAGE_DATA_ID] = (one << IMAGE_COMPRESSED_IMAGE_DATA_ID) | b[DATA_ID];
-
-	// Joystick.
-	b[JOYSTICK_JOYSTICK_ID] = (one << JOYSTICK_JOYSTICK_ID) | b[OBJECT_ID];
-
-	// Math.
-	b[MATH_RANDOM_GENERATOR_ID] = (one << MATH_RANDOM_GENERATOR_ID) | b[OBJECT_ID];
-	b[MATH_BEZIER_CURVE_ID] = (one << MATH_BEZIER_CURVE_ID) | b[OBJECT_ID];
-	b[MATH_COMPRESSED_DATA_ID] = (one <<MATH_COMPRESSED_DATA_ID) | b[DATA_ID];
-
-	// Audio.
-	b[AUDIO_SOURCE_ID] = (one << AUDIO_SOURCE_ID) | b[OBJECT_ID];
-
-	// Sound.
-	b[SOUND_SOUND_DATA_ID] = (one << SOUND_SOUND_DATA_ID) | b[DATA_ID];
-	b[SOUND_DECODER_ID] = one << SOUND_DECODER_ID;
-
-	// Mouse.
-	b[MOUSE_CURSOR_ID] = (one << MOUSE_CURSOR_ID) | b[OBJECT_ID];
-
-	// Physics.
-	b[PHYSICS_WORLD_ID] = (one << PHYSICS_WORLD_ID) | b[OBJECT_ID];
-	b[PHYSICS_CONTACT_ID] = (one << PHYSICS_CONTACT_ID) | b[OBJECT_ID];
-	b[PHYSICS_BODY_ID] = (one << PHYSICS_BODY_ID) | b[OBJECT_ID];
-	b[PHYSICS_FIXTURE_ID] = (one << PHYSICS_FIXTURE_ID) | b[OBJECT_ID];
-	b[PHYSICS_SHAPE_ID] = (one << PHYSICS_SHAPE_ID) | b[OBJECT_ID];
-	b[PHYSICS_CIRCLE_SHAPE_ID] = (one << PHYSICS_CIRCLE_SHAPE_ID) | b[PHYSICS_SHAPE_ID];
-	b[PHYSICS_POLYGON_SHAPE_ID] = (one << PHYSICS_POLYGON_SHAPE_ID) | b[PHYSICS_SHAPE_ID];
-	b[PHYSICS_EDGE_SHAPE_ID] = (one << PHYSICS_EDGE_SHAPE_ID) | b[PHYSICS_SHAPE_ID];
-	b[PHYSICS_CHAIN_SHAPE_ID] = (one << PHYSICS_CHAIN_SHAPE_ID) | b[PHYSICS_SHAPE_ID];
-	b[PHYSICS_JOINT_ID] = (one << PHYSICS_JOINT_ID) | b[OBJECT_ID];
-	b[PHYSICS_MOUSE_JOINT_ID] = (one << PHYSICS_MOUSE_JOINT_ID) | b[PHYSICS_JOINT_ID];
-	b[PHYSICS_DISTANCE_JOINT_ID] = (one << PHYSICS_DISTANCE_JOINT_ID) | b[PHYSICS_JOINT_ID];
-	b[PHYSICS_PRISMATIC_JOINT_ID] = (one << PHYSICS_PRISMATIC_JOINT_ID) | b[PHYSICS_JOINT_ID];
-	b[PHYSICS_REVOLUTE_JOINT_ID] = (one << PHYSICS_REVOLUTE_JOINT_ID) | b[PHYSICS_JOINT_ID];
-	b[PHYSICS_PULLEY_JOINT_ID] = (one << PHYSICS_PULLEY_JOINT_ID) | b[PHYSICS_JOINT_ID];
-	b[PHYSICS_GEAR_JOINT_ID] = (one << PHYSICS_GEAR_JOINT_ID) | b[PHYSICS_JOINT_ID];
-	b[PHYSICS_FRICTION_JOINT_ID] = (one << PHYSICS_FRICTION_JOINT_ID) | b[PHYSICS_JOINT_ID];
-	b[PHYSICS_WELD_JOINT_ID] = (one << PHYSICS_WELD_JOINT_ID) | b[PHYSICS_JOINT_ID];
-	b[PHYSICS_ROPE_JOINT_ID] = (one << PHYSICS_ROPE_JOINT_ID) | b[PHYSICS_JOINT_ID];
-	b[PHYSICS_WHEEL_JOINT_ID] = (one << PHYSICS_WHEEL_JOINT_ID) | b[PHYSICS_JOINT_ID];
-	b[PHYSICS_MOTOR_JOINT_ID] = (one << PHYSICS_MOTOR_JOINT_ID) | b[PHYSICS_JOINT_ID];
-
-	// Thread.
-	b[THREAD_THREAD_ID] = (one << THREAD_THREAD_ID) | b[OBJECT_ID];
-	b[THREAD_CHANNEL_ID] = (one << THREAD_CHANNEL_ID) | b[OBJECT_ID];
-
-	// Video
-	b[VIDEO_VIDEO_STREAM_ID] = (one << VIDEO_VIDEO_STREAM_ID) | b[STREAM_ID];
-
-	// Modules.
-	b[MODULE_FILESYSTEM_ID] = (one << MODULE_FILESYSTEM_ID) | b[MODULE_ID];
-	b[MODULE_GRAPHICS_ID] = (one << MODULE_GRAPHICS_ID) | b[MODULE_ID];
-	b[MODULE_IMAGE_ID] = (one << MODULE_IMAGE_ID) | b[MODULE_ID];
-	b[MODULE_SOUND_ID] = (one << MODULE_SOUND_ID) | b[MODULE_ID];
-
-	return b;
-}
-
-const TypeBits *typeFlags = createTypeFlags();
-
-static StringMap<Type, TYPE_MAX_ENUM> types(nullptr, 0);
-
-void addTypeName(Type type, const char *name)
+void addTypeName(uint32_t type, const char *name)
 {
 	const char *n;
 	if (!types.find(type, n))
 		types.add(name, type);
 }
 
-bool getTypeName(const char *in, love::Type &out)
+bool getTypeName(const char *in, uint32_t &out)
 {
 	return types.find(in, out);
 }
 
-bool getTypeName(love::Type in, const char *&out)
+bool getTypeName(uint32_t in, const char *&out)
 {
 	return types.find(in, out);
 }
 
+uint32_t love::Type::nextId = 1;
+
+Type::Type(Type *parent)
+	: inited(false)
+	, parent(parent)
+{
+}
+
+void love::Type::init()
+{
+	id = nextId++;
+	bits[id] = true;
+	inited = true;
+
+	if (!parent)
+		return;
+	if (!parent->inited)
+		parent->init();
+	bits |= parent->bits;
+}
+
+uint32_t love::Type::getId()
+{
+	if (!inited)
+		init();
+	return id;
+}
+
+bool love::Type::isa(const uint32_t &other)
+{
+	if (!inited)
+		init();
+	return bits[other];
+}
+
+bool love::Type::isa(love::Type &other)
+{
+	if (!other.inited)
+		other.init();
+	return isa(other.id);
+}
+
 } // love
+
+// FIXME: Move this to the relevant files
+#include "Data.h"
+#include "Stream.h"
+#include "graphics/Drawable.h"
+#include "filesystem/Filesystem.h"
+#include "image/Image.h"
+
+love::Type love::Data::type(&Object::type);
+love::Type love::Stream::type(&Object::type);
+love::Type love::graphics::Drawable::type(&Object::type);
+love::Type love::filesystem::Filesystem::type(&Module::type);
+love::Type love::image::Image::type(&Module::type);
diff --git a/src/common/types.h b/src/common/types.h
index a18191947..6dc368646 100644
--- a/src/common/types.h
+++ b/src/common/types.h
@@ -23,115 +23,38 @@
 
 // STD
 #include <bitset>
+#include <vector>
 
 namespace love
 {
 
-enum Type
+void addTypeName(uint32_t type, const char *name);
+bool getTypeName(const char *in, uint32_t &out);
+bool getTypeName(uint32_t in, const char *&out);
+
+class Type
 {
-	INVALID_ID = 0,
-	// Cross-module types.
-	OBJECT_ID,
-	DATA_ID,
-	MODULE_ID,
-	STREAM_ID,
+public:
+	static const uint32_t MAX_TYPES = 128;
 
-	// Filesystem.
-	FILESYSTEM_FILE_ID,
-	FILESYSTEM_DROPPED_FILE_ID,
-	FILESYSTEM_FILE_DATA_ID,
+	// TODO: Type-checking templated constructor
+	Type(Type *parent);
 
-	// Font
-	FONT_GLYPH_DATA_ID,
-	FONT_RASTERIZER_ID,
+	uint32_t getId();
+	bool isa(const uint32_t &other);
+	bool isa(Type &other);
 
-	// Graphics
-	GRAPHICS_DRAWABLE_ID,
-	GRAPHICS_TEXTURE_ID,
-	GRAPHICS_IMAGE_ID,
-	GRAPHICS_QUAD_ID,
-	GRAPHICS_FONT_ID,
-	GRAPHICS_PARTICLE_SYSTEM_ID,
-	GRAPHICS_SPRITE_BATCH_ID,
-	GRAPHICS_CANVAS_ID,
-	GRAPHICS_SHADER_ID,
-	GRAPHICS_MESH_ID,
-	GRAPHICS_TEXT_ID,
-	GRAPHICS_VIDEO_ID,
+private:
+	static uint32_t nextId;
+	void init();
 
-	// Image
-	IMAGE_IMAGE_DATA_ID,
-	IMAGE_COMPRESSED_IMAGE_DATA_ID,
+	bool inited;
+	Type *parent;
 
-	// Joystick
-	JOYSTICK_JOYSTICK_ID,
-
-	// Math
-	MATH_RANDOM_GENERATOR_ID,
-	MATH_BEZIER_CURVE_ID,
-	MATH_COMPRESSED_DATA_ID,
-
-	// Audio
-	AUDIO_SOURCE_ID,
-
-	// Sound
-	SOUND_SOUND_DATA_ID,
-	SOUND_DECODER_ID,
-
-	// Mouse
-	MOUSE_CURSOR_ID,
-
-	// Physics
-	PHYSICS_WORLD_ID,
-	PHYSICS_CONTACT_ID,
-	PHYSICS_BODY_ID,
-	PHYSICS_FIXTURE_ID,
-	PHYSICS_SHAPE_ID,
-	PHYSICS_CIRCLE_SHAPE_ID,
-	PHYSICS_POLYGON_SHAPE_ID,
-	PHYSICS_EDGE_SHAPE_ID,
-	PHYSICS_CHAIN_SHAPE_ID,
-	PHYSICS_JOINT_ID,
-	PHYSICS_MOUSE_JOINT_ID,
-	PHYSICS_DISTANCE_JOINT_ID,
-	PHYSICS_PRISMATIC_JOINT_ID,
-	PHYSICS_REVOLUTE_JOINT_ID,
-	PHYSICS_PULLEY_JOINT_ID,
-	PHYSICS_GEAR_JOINT_ID,
-	PHYSICS_FRICTION_JOINT_ID,
-	PHYSICS_WELD_JOINT_ID,
-	PHYSICS_ROPE_JOINT_ID,
-	PHYSICS_WHEEL_JOINT_ID,
-	PHYSICS_MOTOR_JOINT_ID,
-
-	// Thread
-	THREAD_THREAD_ID,
-	THREAD_CHANNEL_ID,
-
-	// Video
-	VIDEO_VIDEO_STREAM_ID,
-
-	// The modules themselves. Only add abstracted modules here.
-	MODULE_FILESYSTEM_ID,
-	MODULE_GRAPHICS_ID,
-	MODULE_IMAGE_ID,
-	MODULE_SOUND_ID,
-
-	// Count the number of bits needed.
-	TYPE_MAX_ENUM
+	uint32_t id;
+	std::bitset<MAX_TYPES> bits;
 };
 
-typedef std::bitset<TYPE_MAX_ENUM> TypeBits;
-
-/**
- * Array of length TYPE_MAX_ENUM containing the flags for each love Type.
- **/
-extern const TypeBits *typeFlags;
-
-void addTypeName(Type type, const char *name);
-bool getTypeName(const char *in, Type &out);
-bool getTypeName(Type in, const char *&out);
-
 } // love
 
 #endif // LOVE_TYPES_H
diff --git a/src/common/wrap_Data.cpp b/src/common/wrap_Data.cpp
index 763c1869c..43e4b92fc 100644
--- a/src/common/wrap_Data.cpp
+++ b/src/common/wrap_Data.cpp
@@ -25,7 +25,7 @@ namespace love
 
 Data *luax_checkdata(lua_State *L, int idx)
 {
-	return luax_checktype<Data>(L, idx, DATA_ID);
+	return luax_checktype<Data>(L, idx, Data::type);
 }
 
 int w_Data_getString(lua_State *L)
@@ -59,7 +59,7 @@ const luaL_Reg w_Data_functions[] =
 
 int w_Data_open(lua_State *L)
 {
-	luax_register_type(L, DATA_ID, "Data", w_Data_functions, nullptr);
+	luax_register_type(L, Data::type, "Data", w_Data_functions, nullptr);
 	return 0;
 }
 
diff --git a/src/modules/audio/Source.cpp b/src/modules/audio/Source.cpp
index db3569e61..a68f034b7 100644
--- a/src/modules/audio/Source.cpp
+++ b/src/modules/audio/Source.cpp
@@ -25,8 +25,10 @@ namespace love
 namespace audio
 {
 
-Source::Source(Type type)
-	: type(type)
+love::Type Source::type(&Object::type);
+
+Source::Source(Type sourceType)
+	: sourceType(sourceType)
 {
 }
 
@@ -36,7 +38,7 @@ Source::~Source()
 
 Source::Type Source::getType() const
 {
-	return type;
+	return sourceType;
 }
 
 bool Source::getConstant(const char *in, Type &out)
diff --git a/src/modules/audio/Source.h b/src/modules/audio/Source.h
index b7f97f955..d6ce57621 100644
--- a/src/modules/audio/Source.h
+++ b/src/modules/audio/Source.h
@@ -34,6 +34,8 @@ class Source : public Object
 {
 public:
 
+	static love::Type type;
+
 	enum Type
 	{
 		TYPE_STATIC,
@@ -114,7 +116,7 @@ public:
 
 protected:
 
-	Type type;
+	Type sourceType;
 
 private:
 
diff --git a/src/modules/audio/openal/Source.cpp b/src/modules/audio/openal/Source.cpp
index 47169c583..0b904d87a 100644
--- a/src/modules/audio/openal/Source.cpp
+++ b/src/modules/audio/openal/Source.cpp
@@ -178,7 +178,7 @@ Source::Source(Pool *pool, int sampleRate, int bitDepth, int channels)
 }
 
 Source::Source(const Source &s)
-	: love::audio::Source(s.type)
+	: love::audio::Source(s.sourceType)
 	, pool(s.pool)
 	, valid(false)
 	, staticBuffer(s.staticBuffer)
@@ -199,14 +199,14 @@ Source::Source(const Source &s)
 	, bitDepth(s.bitDepth)
 	, decoder(nullptr)
 	, toLoop(0)
-	, unusedBufferTop(s.type == TYPE_STREAM ? MAX_BUFFERS - 1 : -1)
+	, unusedBufferTop(s.sourceType == TYPE_STREAM ? MAX_BUFFERS - 1 : -1)
 {
-	if (type == TYPE_STREAM)
+	if (sourceType == TYPE_STREAM)
 	{
 		if (s.decoder.get())
 			decoder.set(s.decoder->clone(), Acquire::NORETAIN);
 	}
-	if (type != TYPE_STATIC)
+	if (sourceType != TYPE_STATIC)
 	{
 		alGenBuffers(MAX_BUFFERS, streamBuffers);
 		for (unsigned int i = 0; i < MAX_BUFFERS; i++)
@@ -223,7 +223,7 @@ Source::~Source()
 	if (valid)
 		pool->stop(this);
 
-	if (type != TYPE_STATIC)
+	if (sourceType != TYPE_STATIC)
 		alDeleteBuffers(MAX_BUFFERS, streamBuffers);
 }
 
@@ -264,7 +264,7 @@ bool Source::isFinished() const
 	if (!valid)
 		return false;
 
-	if (type == TYPE_STREAM && (isLooping() || !decoder->isFinished()))
+	if (sourceType == TYPE_STREAM && (isLooping() || !decoder->isFinished()))
 		return false;
 
 	ALenum state;
@@ -277,7 +277,7 @@ bool Source::update()
 	if (!valid)
 		return false;
 
-	switch (type)
+	switch (sourceType)
 	{
 		case TYPE_STATIC:
 			// Looping mode could have changed.
@@ -401,7 +401,7 @@ void Source::seekAtomic(float offset, void *unit)
 		break;
 	}
 
-	switch (type)
+	switch (sourceType)
 	{
 		case TYPE_STATIC:
 			alSourcef(source, AL_SAMPLE_OFFSET, offsetSamples);
@@ -494,7 +494,7 @@ double Source::getDurationAtomic(void *vunit)
 {
 	Unit unit = *(Unit *) vunit;
 
-	switch (type)
+	switch (sourceType)
 	{
 		case TYPE_STATIC:
 		{
@@ -649,10 +649,10 @@ bool Source::isRelative() const
 
 void Source::setLooping(bool enable)
 {
-	if (type == TYPE_QUEUE)
+	if (sourceType == TYPE_QUEUE)
 		throw QueueLoopingException();
 
-	if (valid && type == TYPE_STATIC)
+	if (valid && sourceType == TYPE_STATIC)
 		alSourcei(source, AL_LOOPING, enable ? AL_TRUE : AL_FALSE);
 
 	looping = enable;
@@ -665,7 +665,7 @@ bool Source::isLooping() const
 
 bool Source::queue(void *data, size_t length, int dataSampleRate, int dataBitDepth, int dataChannels)
 {
-	if (type != TYPE_QUEUE)
+	if (sourceType != TYPE_QUEUE)
 		throw QueueTypeMismatchException();
 
 	if (dataSampleRate != sampleRate || dataBitDepth != bitDepth || dataChannels != channels )
@@ -709,7 +709,7 @@ bool Source::queueAtomic(void *data, ALsizei length)
 
 int Source::getFreeBufferCount() const
 {
-	switch (type) //why not :^)
+	switch (sourceType) //why not :^)
 	{
 		case TYPE_STATIC: 
 			return 0;
@@ -730,7 +730,7 @@ void Source::prepareAtomic()
 	// of the new one.
 	reset();
 
-	switch (type)
+	switch (sourceType)
 	{
 		case TYPE_STATIC:
 			alSourcei(source, AL_BUFFER, staticBuffer->getBuffer());
@@ -771,7 +771,7 @@ void Source::prepareAtomic()
 
 void Source::teardownAtomic()
 {
-	switch (type)
+	switch (sourceType)
 	{
 		case TYPE_STATIC:
 			alSourcef(source, AL_SAMPLE_OFFSET, 0);
@@ -839,7 +839,7 @@ bool Source::playAtomic(ALuint source)
 	valid = true; //if it fails it will be set to false again
 	//but this prevents a horrible, horrible bug
 
-	if (type != TYPE_STREAM)
+	if (sourceType != TYPE_STREAM)
 		offsetSamples = offsetSeconds = 0;
 
 	return success;
@@ -891,7 +891,7 @@ bool Source::playAtomic(const std::vector<love::audio::Source*> &sources, const
 		Source *source = (Source*) _source;
 		source->valid = source->valid || success;
 
-		if (success && source->type != TYPE_STREAM)
+		if (success && source->sourceType != TYPE_STREAM)
 			source->offsetSamples = source->offsetSeconds = 0;
 	}
 
@@ -952,7 +952,7 @@ void Source::reset()
 	alSourcef(source, AL_REFERENCE_DISTANCE, referenceDistance);
 	alSourcef(source, AL_ROLLOFF_FACTOR, rolloffFactor);
 	alSourcef(source, AL_MAX_DISTANCE, maxDistance);
-	alSourcei(source, AL_LOOPING, (type == TYPE_STATIC) && isLooping() ? AL_TRUE : AL_FALSE);
+	alSourcei(source, AL_LOOPING, (sourceType == TYPE_STATIC) && isLooping() ? AL_TRUE : AL_FALSE);
 	alSourcei(source, AL_SOURCE_RELATIVE, relative ? AL_TRUE : AL_FALSE);
 	alSourcei(source, AL_CONE_INNER_ANGLE, cone.innerAngle);
 	alSourcei(source, AL_CONE_OUTER_ANGLE, cone.outerAngle);
diff --git a/src/modules/audio/wrap_Audio.cpp b/src/modules/audio/wrap_Audio.cpp
index 7a178abc8..0389b3fd4 100644
--- a/src/modules/audio/wrap_Audio.cpp
+++ b/src/modules/audio/wrap_Audio.cpp
@@ -46,31 +46,31 @@ int w_newSource(lua_State *L)
 {
 	Source::Type stype = Source::TYPE_STREAM;
 
-	if (!luax_istype(L, 1, SOUND_SOUND_DATA_ID) && !luax_istype(L, 1, SOUND_DECODER_ID))
+	if (!luax_istype(L, 1, love::sound::SoundData::type) && !luax_istype(L, 1, love::sound::Decoder::type))
 	{
 		const char *stypestr = luaL_checkstring(L, 2);
 		if (stypestr && !Source::getConstant(stypestr, stype))
 			return luaL_error(L, "Invalid source type: %s", stypestr);
 	}
 
-	if (lua_isstring(L, 1) || luax_istype(L, 1, FILESYSTEM_FILE_ID) || luax_istype(L, 1, FILESYSTEM_FILE_DATA_ID))
+	if (lua_isstring(L, 1) || luax_istype(L, 1, love::filesystem::File::type) || luax_istype(L, 1, love::filesystem::FileData::type))
 		luax_convobj(L, 1, "sound", "newDecoder");
 
-	if (stype == Source::TYPE_STATIC && luax_istype(L, 1, SOUND_DECODER_ID))
+	if (stype == Source::TYPE_STATIC && luax_istype(L, 1, love::sound::Decoder::type))
 		luax_convobj(L, 1, "sound", "newSoundData");
 
 	Source *t = nullptr;
 
 	luax_catchexcept(L, [&]() {
-		if (luax_istype(L, 1, SOUND_SOUND_DATA_ID))
-			t = instance()->newSource(luax_totype<love::sound::SoundData>(L, 1, SOUND_SOUND_DATA_ID));
-		else if (luax_istype(L, 1, SOUND_DECODER_ID))
-			t = instance()->newSource(luax_totype<love::sound::Decoder>(L, 1, SOUND_DECODER_ID));
+		if (luax_istype(L, 1, love::sound::SoundData::type))
+			t = instance()->newSource(luax_totype<love::sound::SoundData>(L, 1, love::sound::SoundData::type));
+		else if (luax_istype(L, 1, love::sound::Decoder::type))
+			t = instance()->newSource(luax_totype<love::sound::Decoder>(L, 1, love::sound::Decoder::type));
 	});
 
 	if (t != nullptr)
 	{
-		luax_pushtype(L, AUDIO_SOURCE_ID, t);
+		luax_pushtype(L, love::audio::Source::type, t);
 		t->release();
 		return 1;
 	}
@@ -88,7 +88,7 @@ int w_newQueueableSource(lua_State *L)
 
 	if (t != nullptr)
 	{
-		luax_pushtype(L, AUDIO_SOURCE_ID, t);
+		luax_pushtype(L, love::audio::Source::type, t);
 		t->release();
 		return 1;
 	}
@@ -150,7 +150,7 @@ int w_pause(lua_State *L)
 		lua_createtable(L, (int) sources.size(), 0);
 		for (int i = 0; i < (int) sources.size(); i++)
 		{
-			luax_pushtype(L, AUDIO_SOURCE_ID, sources[i]);
+			luax_pushtype(L, love::audio::Source::type, sources[i]);
 			lua_rawseti(L, -2, i+1);
 		}
 		return 1;
@@ -270,7 +270,7 @@ int w_getRecordedData(lua_State *L)
 		lua_pushnil(L);
 	else
 	{
-		luax_pushtype(L, SOUND_SOUND_DATA_ID, sd);
+		luax_pushtype(L, love::sound::SoundData::type, sd);
 		sd->release();
 	}
 	return 1;
@@ -285,7 +285,7 @@ int w_stopRecording(lua_State *L)
 			lua_pushnil(L);
 		else
 		{
-			luax_pushtype(L, SOUND_SOUND_DATA_ID, sd);
+			luax_pushtype(L, love::sound::SoundData::type, sd);
 			sd->release();
 		}
 		return 1;
@@ -395,7 +395,7 @@ extern "C" int luaopen_love_audio(lua_State *L)
 	WrappedModule w;
 	w.module = instance;
 	w.name = "audio";
-	w.type = MODULE_ID;
+	w.type = &Module::type;
 	w.functions = functions;
 	w.types = types;
 
diff --git a/src/modules/audio/wrap_Source.cpp b/src/modules/audio/wrap_Source.cpp
index 35e9f3c91..73c95836e 100644
--- a/src/modules/audio/wrap_Source.cpp
+++ b/src/modules/audio/wrap_Source.cpp
@@ -30,7 +30,7 @@ namespace audio
 
 Source *luax_checksource(lua_State *L, int idx)
 {
-	return luax_checktype<Source>(L, idx, AUDIO_SOURCE_ID);
+	return luax_checktype<Source>(L, idx, love::audio::Source::type);
 }
 
 int w_Source_clone(lua_State *L)
@@ -38,7 +38,7 @@ int w_Source_clone(lua_State *L)
 	Source *t = luax_checksource(L, 1);
 	Source *clone = nullptr;
 	luax_catchexcept(L, [&](){ clone = t->clone(); });
-	luax_pushtype(L, AUDIO_SOURCE_ID, clone);
+	luax_pushtype(L, love::audio::Source::type, clone);
 	clone->release();
 	return 1;
 }
@@ -342,9 +342,9 @@ int w_Source_queue(lua_State *L)
 	Source *t = luax_checksource(L, 1);
 	bool success;
 
-	if (luax_istype(L, 2, SOUND_SOUND_DATA_ID))
+	if (luax_istype(L, 2, love::sound::SoundData::type))
 	{
-		auto s = luax_totype<love::sound::SoundData>(L, 2, SOUND_SOUND_DATA_ID);
+		auto s = luax_totype<love::sound::SoundData>(L, 2, love::sound::SoundData::type);
 
 		int offset = 0;
 		size_t length = s->getSize();
@@ -450,7 +450,7 @@ static const luaL_Reg w_Source_functions[] =
 
 extern "C" int luaopen_source(lua_State *L)
 {
-	return luax_register_type(L, AUDIO_SOURCE_ID, "Source", w_Source_functions, nullptr);
+	return luax_register_type(L, love::audio::Source::type, "Source", w_Source_functions, nullptr);
 }
 
 } // audio
diff --git a/src/modules/event/sdl/Event.cpp b/src/modules/event/sdl/Event.cpp
index 50de0a7a4..15c23db59 100644
--- a/src/modules/event/sdl/Event.cpp
+++ b/src/modules/event/sdl/Event.cpp
@@ -364,7 +364,7 @@ Message *Event::convert(const SDL_Event &e) const
 			{
 				Proxy proxy;
 				proxy.object = new love::filesystem::DroppedFile(e.drop.file);
-				proxy.type = FILESYSTEM_DROPPED_FILE_ID;
+				proxy.type = &love::filesystem::DroppedFile::type;
 				vargs.emplace_back(proxy.type, &proxy);
 				msg = new Message("filedropped", vargs);
 				proxy.object->release();
@@ -407,7 +407,7 @@ Message *Event::convertJoystickEvent(const SDL_Event &e) const
 	{
 	case SDL_JOYBUTTONDOWN:
 	case SDL_JOYBUTTONUP:
-		proxy.type = JOYSTICK_JOYSTICK_ID;
+		proxy.type = &love::joystick::Joystick::type;
 		proxy.object = joymodule->getJoystickFromID(e.jbutton.which);
 		if (!proxy.object)
 			break;
@@ -420,7 +420,7 @@ Message *Event::convertJoystickEvent(const SDL_Event &e) const
 		break;
 	case SDL_JOYAXISMOTION:
 		{
-			proxy.type = JOYSTICK_JOYSTICK_ID;
+			proxy.type = &love::joystick::Joystick::type;
 			proxy.object = joymodule->getJoystickFromID(e.jaxis.which);
 			if (!proxy.object)
 				break;
@@ -436,7 +436,7 @@ Message *Event::convertJoystickEvent(const SDL_Event &e) const
 		if (!joystick::sdl::Joystick::getConstant(e.jhat.value, hat) || !joystick::Joystick::getConstant(hat, txt))
 			break;
 
-		proxy.type = JOYSTICK_JOYSTICK_ID;
+		proxy.type = &love::joystick::Joystick::type;
 		proxy.object = joymodule->getJoystickFromID(e.jhat.which);
 		if (!proxy.object)
 			break;
@@ -454,7 +454,7 @@ Message *Event::convertJoystickEvent(const SDL_Event &e) const
 		if (!joystick::Joystick::getConstant(padbutton, txt))
 			break;
 
-		proxy.type = JOYSTICK_JOYSTICK_ID;
+		proxy.type = &love::joystick::Joystick::type;
 		proxy.object = joymodule->getJoystickFromID(e.cbutton.which);
 		if (!proxy.object)
 			break;
@@ -470,7 +470,7 @@ Message *Event::convertJoystickEvent(const SDL_Event &e) const
 			if (!joystick::Joystick::getConstant(padaxis, txt))
 				break;
 
-			proxy.type = JOYSTICK_JOYSTICK_ID;
+			proxy.type = &love::joystick::Joystick::type;
 			proxy.object = joymodule->getJoystickFromID(e.caxis.which);
 			if (!proxy.object)
 				break;
@@ -486,7 +486,7 @@ Message *Event::convertJoystickEvent(const SDL_Event &e) const
 	case SDL_JOYDEVICEADDED:
 		// jdevice.which is the joystick device index.
 		proxy.object = joymodule->addJoystick(e.jdevice.which);
-		proxy.type = JOYSTICK_JOYSTICK_ID;
+		proxy.type = &love::joystick::Joystick::type;
 		if (proxy.object)
 		{
 			vargs.emplace_back(proxy.type, (void *) &proxy);
@@ -496,7 +496,7 @@ Message *Event::convertJoystickEvent(const SDL_Event &e) const
 	case SDL_JOYDEVICEREMOVED:
 		// jdevice.which is the joystick instance ID now.
 		proxy.object = joymodule->getJoystickFromID(e.jdevice.which);
-		proxy.type = JOYSTICK_JOYSTICK_ID;
+		proxy.type = &love::joystick::Joystick::type;
 		if (proxy.object)
 		{
 			joymodule->removeJoystick((joystick::Joystick *) proxy.object);
diff --git a/src/modules/event/wrap_Event.cpp b/src/modules/event/wrap_Event.cpp
index 06b9686f6..f8b6f2402 100644
--- a/src/modules/event/wrap_Event.cpp
+++ b/src/modules/event/wrap_Event.cpp
@@ -127,7 +127,7 @@ extern "C" int luaopen_love_event(lua_State *L)
 	WrappedModule w;
 	w.module = instance;
 	w.name = "event";
-	w.type = MODULE_ID;
+	w.type = &Module::type;
 	w.functions = functions;
 	w.types = nullptr;
 
diff --git a/src/modules/filesystem/DroppedFile.cpp b/src/modules/filesystem/DroppedFile.cpp
index a6b6358dc..ebdee5565 100644
--- a/src/modules/filesystem/DroppedFile.cpp
+++ b/src/modules/filesystem/DroppedFile.cpp
@@ -37,6 +37,8 @@ namespace love
 namespace filesystem
 {
 
+love::Type DroppedFile::type(&File::type);
+
 DroppedFile::DroppedFile(const std::string &filename)
 	: filename(filename)
 	, file(nullptr)
diff --git a/src/modules/filesystem/DroppedFile.h b/src/modules/filesystem/DroppedFile.h
index c3b2ae467..aa916c9c5 100644
--- a/src/modules/filesystem/DroppedFile.h
+++ b/src/modules/filesystem/DroppedFile.h
@@ -41,6 +41,8 @@ class DroppedFile : public File
 {
 public:
 
+	static love::Type type;
+
 	DroppedFile(const std::string &filename);
 	virtual ~DroppedFile();
 
diff --git a/src/modules/filesystem/File.cpp b/src/modules/filesystem/File.cpp
index 16cc10b52..95670c401 100644
--- a/src/modules/filesystem/File.cpp
+++ b/src/modules/filesystem/File.cpp
@@ -25,6 +25,8 @@ namespace love
 namespace filesystem
 {
 
+love::Type File::type(&Object::type);
+
 File::~File()
 {
 }
diff --git a/src/modules/filesystem/File.h b/src/modules/filesystem/File.h
index 850be711b..cb3515e2c 100644
--- a/src/modules/filesystem/File.h
+++ b/src/modules/filesystem/File.h
@@ -44,6 +44,8 @@ class File : public Object
 {
 public:
 
+	static love::Type type;
+
 	/**
 	 * File open mode.
 	 **/
diff --git a/src/modules/filesystem/FileData.cpp b/src/modules/filesystem/FileData.cpp
index 9ce9d94d3..6b8a7e089 100644
--- a/src/modules/filesystem/FileData.cpp
+++ b/src/modules/filesystem/FileData.cpp
@@ -29,6 +29,8 @@ namespace love
 namespace filesystem
 {
 
+love::Type FileData::type(&Data::type);
+
 FileData::FileData(uint64 size, const std::string &filename)
 	: data(nullptr)
 	, size((size_t) size)
diff --git a/src/modules/filesystem/FileData.h b/src/modules/filesystem/FileData.h
index 2e4e9abcd..4f00e99bd 100644
--- a/src/modules/filesystem/FileData.h
+++ b/src/modules/filesystem/FileData.h
@@ -37,6 +37,8 @@ class FileData : public Data
 {
 public:
 
+	static love::Type type;
+
 	FileData(uint64 size, const std::string &filename);
 
 	virtual ~FileData();
diff --git a/src/modules/filesystem/Filesystem.h b/src/modules/filesystem/Filesystem.h
index 17748f65a..063a768b1 100644
--- a/src/modules/filesystem/Filesystem.h
+++ b/src/modules/filesystem/Filesystem.h
@@ -61,6 +61,8 @@ class Filesystem : public Module
 {
 public:
 
+	static love::Type type;
+
 	Filesystem();
 	virtual ~Filesystem();
 
diff --git a/src/modules/filesystem/wrap_DroppedFile.cpp b/src/modules/filesystem/wrap_DroppedFile.cpp
index 2e224747b..f54e3661c 100644
--- a/src/modules/filesystem/wrap_DroppedFile.cpp
+++ b/src/modules/filesystem/wrap_DroppedFile.cpp
@@ -28,12 +28,12 @@ namespace filesystem
 
 DroppedFile *luax_checkdroppedfile(lua_State *L, int idx)
 {
-	return luax_checktype<DroppedFile>(L, idx, FILESYSTEM_DROPPED_FILE_ID);
+	return luax_checktype<DroppedFile>(L, idx, DroppedFile::type);
 }
 
 extern "C" int luaopen_droppedfile(lua_State *L)
 {
-	return luax_register_type(L, FILESYSTEM_DROPPED_FILE_ID, "DroppedFile", w_File_functions, nullptr);
+	return luax_register_type(L, DroppedFile::type, "DroppedFile", w_File_functions, nullptr);
 }
 
 } // filesystem
diff --git a/src/modules/filesystem/wrap_File.cpp b/src/modules/filesystem/wrap_File.cpp
index 90e96c01e..eff5bef70 100644
--- a/src/modules/filesystem/wrap_File.cpp
+++ b/src/modules/filesystem/wrap_File.cpp
@@ -43,7 +43,7 @@ int luax_ioError(lua_State *L, const char *fmt, ...)
 
 File *luax_checkfile(lua_State *L, int idx)
 {
-	return luax_checktype<File>(L, idx, FILESYSTEM_FILE_ID);
+	return luax_checktype<File>(L, idx, love::filesystem::File::type);
 }
 
 int w_File_getSize(lua_State *L)
@@ -148,11 +148,11 @@ int w_File_write(lua_State *L)
 			return luax_ioError(L, "%s", e.what());
 		}
 	}
-	else if (luax_istype(L, 2, DATA_ID))
+	else if (luax_istype(L, 2, love::Data::type))
 	{
 		try
 		{
-			love::Data *data = luax_totype<love::Data>(L, 2, DATA_ID);
+			love::Data *data = luax_totype<love::Data>(L, 2, love::Data::type);
 			result = file->write(data, luaL_optinteger(L, 3, data->getSize()));
 		}
 		catch (love::Exception &e)
@@ -227,7 +227,7 @@ int w_File_lines_i(lua_State *L)
 	int linesize = 0;
 	bool newline = false;
 
-	File *file = luax_checktype<File>(L, lua_upvalueindex(1), FILESYSTEM_FILE_ID);
+	File *file = luax_checktype<File>(L, lua_upvalueindex(1), File::type);
 
 	// Only accept read mode at this point.
 	if (file->getMode() != File::MODE_READ)
@@ -435,7 +435,7 @@ const luaL_Reg w_File_functions[] =
 
 extern "C" int luaopen_file(lua_State *L)
 {
-	return luax_register_type(L, FILESYSTEM_FILE_ID, "File", w_File_functions, nullptr);
+	return luax_register_type(L, File::type, "File", w_File_functions, nullptr);
 }
 
 } // filesystem
diff --git a/src/modules/filesystem/wrap_FileData.cpp b/src/modules/filesystem/wrap_FileData.cpp
index dedaf1950..678b17f22 100644
--- a/src/modules/filesystem/wrap_FileData.cpp
+++ b/src/modules/filesystem/wrap_FileData.cpp
@@ -29,7 +29,7 @@ namespace filesystem
 
 FileData *luax_checkfiledata(lua_State *L, int idx)
 {
-	return luax_checktype<FileData>(L, idx, FILESYSTEM_FILE_DATA_ID);
+	return luax_checktype<FileData>(L, idx, FileData::type);
 }
 
 int w_FileData_getFilename(lua_State *L)
@@ -56,7 +56,7 @@ static const luaL_Reg w_FileData_functions[] =
 
 extern "C" int luaopen_filedata(lua_State *L)
 {
-	return luax_register_type(L, FILESYSTEM_FILE_DATA_ID, "FileData", w_Data_functions, w_FileData_functions, nullptr);
+	return luax_register_type(L, FileData::type, "FileData", w_Data_functions, w_FileData_functions, nullptr);
 }
 
 } // filesystem
diff --git a/src/modules/filesystem/wrap_Filesystem.cpp b/src/modules/filesystem/wrap_Filesystem.cpp
index e68a4df27..a724a8afc 100644
--- a/src/modules/filesystem/wrap_Filesystem.cpp
+++ b/src/modules/filesystem/wrap_Filesystem.cpp
@@ -113,9 +113,9 @@ int w_mount(lua_State *L)
 {
 	std::string archive;
 
-	if (luax_istype(L, 1, FILESYSTEM_DROPPED_FILE_ID))
+	if (luax_istype(L, 1, DroppedFile::type))
 	{
-		DroppedFile *file = luax_totype<DroppedFile>(L, 1, FILESYSTEM_DROPPED_FILE_ID);
+		DroppedFile *file = luax_totype<DroppedFile>(L, 1, DroppedFile::type);
 		archive = file->getFilename();
 	}
 	else
@@ -166,7 +166,7 @@ int w_newFile(lua_State *L)
 		}
 	}
 
-	luax_pushtype(L, FILESYSTEM_FILE_ID, t);
+	luax_pushtype(L, File::type, t);
 	t->release();
 	return 1;
 }
@@ -190,12 +190,12 @@ FileData *luax_getfiledata(lua_State *L, int idx)
 	FileData *data = nullptr;
 	File *file = nullptr;
 
-	if (lua_isstring(L, idx) || luax_istype(L, idx, FILESYSTEM_FILE_ID))
+	if (lua_isstring(L, idx) || luax_istype(L, idx, File::type))
 	{
 		file = luax_getfile(L, idx);
 		file->retain();
 	}
-	else if (luax_istype(L, idx, FILESYSTEM_FILE_DATA_ID))
+	else if (luax_istype(L, idx, FileData::type))
 	{
 		data = luax_checkfiledata(L, idx);
 		data->retain();
@@ -220,7 +220,7 @@ FileData *luax_getfiledata(lua_State *L, int idx)
 
 bool luax_cangetfiledata(lua_State *L, int idx)
 {
-	return lua_isstring(L, idx) || luax_istype(L, idx, FILESYSTEM_FILE_ID) || luax_istype(L, idx, FILESYSTEM_FILE_DATA_ID);
+	return lua_isstring(L, idx) || luax_istype(L, idx, File::type) || luax_istype(L, idx, FileData::type);
 }
 
 int w_newFileData(lua_State *L)
@@ -233,7 +233,7 @@ int w_newFileData(lua_State *L)
 			luax_convobj(L, 1, "filesystem", "newFile");
 
 		// Get FileData from the File.
-		if (luax_istype(L, 1, FILESYSTEM_FILE_ID))
+		if (luax_istype(L, 1, File::type))
 		{
 			File *file = luax_checkfile(L, 1);
 
@@ -246,7 +246,7 @@ int w_newFileData(lua_State *L)
 			{
 				return luax_ioError(L, "%s", e.what());
 			}
-			luax_pushtype(L, FILESYSTEM_FILE_DATA_ID, data);
+			luax_pushtype(L, FileData::type, data);
 			return 1;
 		}
 		else
@@ -260,7 +260,7 @@ int w_newFileData(lua_State *L)
 	FileData *t = nullptr;
 	luax_catchexcept(L, [&](){ t = instance()->newFileData(str, length, filename); });
 
-	luax_pushtype(L, FILESYSTEM_FILE_DATA_ID, t);
+	luax_pushtype(L, FileData::type, t);
 	t->release();
 	return 1;
 }
@@ -398,9 +398,9 @@ static int w_write_or_append(lua_State *L, File::Mode mode)
 	const char *input = 0;
 	size_t len = 0;
 
-	if (luax_istype(L, 2, DATA_ID))
+	if (luax_istype(L, 2, love::Data::type))
 	{
-		love::Data *data = luax_totype<love::Data>(L, 2, DATA_ID);
+		love::Data *data = luax_totype<love::Data>(L, 2, love::Data::type);
 		input = (const char *) data->getData();
 		len = data->getSize();
 	}
@@ -474,7 +474,7 @@ int w_lines(lua_State *L)
 			return luaL_error(L, "Could not open file.");
 		}
 
-		luax_pushtype(L, FILESYSTEM_FILE_ID, file);
+		luax_pushtype(L, File::type, file);
 		file->release();
 	}
 	else
@@ -810,7 +810,7 @@ extern "C" int luaopen_love_filesystem(lua_State *L)
 	WrappedModule w;
 	w.module = instance;
 	w.name = "filesystem";
-	w.type = MODULE_FILESYSTEM_ID;
+	w.type = &Filesystem::type;
 	w.functions = functions;
 	w.types = types;
 
diff --git a/src/modules/font/GlyphData.cpp b/src/modules/font/GlyphData.cpp
index 7a7665224..da099d026 100644
--- a/src/modules/font/GlyphData.cpp
+++ b/src/modules/font/GlyphData.cpp
@@ -33,6 +33,8 @@ namespace love
 namespace font
 {
 
+love::Type GlyphData::type(&Data::type);
+
 GlyphData::GlyphData(uint32 glyph, GlyphMetrics glyphMetrics, GlyphData::Format f)
 	: glyph(glyph)
 	, metrics(glyphMetrics)
diff --git a/src/modules/font/GlyphData.h b/src/modules/font/GlyphData.h
index a70118957..d5fcfc11d 100644
--- a/src/modules/font/GlyphData.h
+++ b/src/modules/font/GlyphData.h
@@ -55,6 +55,8 @@ class GlyphData : public Data
 {
 public:
 
+	static love::Type type;
+
 	enum Format
 	{
 		FORMAT_LUMINANCE_ALPHA,
diff --git a/src/modules/font/Rasterizer.cpp b/src/modules/font/Rasterizer.cpp
index 5af9efab7..196b9206b 100644
--- a/src/modules/font/Rasterizer.cpp
+++ b/src/modules/font/Rasterizer.cpp
@@ -29,6 +29,8 @@ namespace love
 namespace font
 {
 
+love::Type Rasterizer::type(&Object::type);
+
 Rasterizer::~Rasterizer()
 {
 }
diff --git a/src/modules/font/Rasterizer.h b/src/modules/font/Rasterizer.h
index a0d5c7210..0536a9119 100644
--- a/src/modules/font/Rasterizer.h
+++ b/src/modules/font/Rasterizer.h
@@ -49,6 +49,8 @@ class Rasterizer : public Object
 {
 public:
 
+	static love::Type type;
+
 	virtual ~Rasterizer();
 
 	/**
diff --git a/src/modules/font/wrap_Font.cpp b/src/modules/font/wrap_Font.cpp
index f11e33e57..ac6a3cde2 100644
--- a/src/modules/font/wrap_Font.cpp
+++ b/src/modules/font/wrap_Font.cpp
@@ -53,7 +53,7 @@ int w_newRasterizer(lua_State *L)
 			[&](bool) { d->release(); }
 		);
 
-		luax_pushtype(L, FONT_RASTERIZER_ID, t);
+		luax_pushtype(L, Rasterizer::type, t);
 		t->release();
 		return 1;
 	}
@@ -84,7 +84,7 @@ int w_newTrueTypeRasterizer(lua_State *L)
 	{
 		love::Data *d = nullptr;
 
-		if (luax_istype(L, 1, DATA_ID))
+		if (luax_istype(L, 1, love::Data::type))
 		{
 			d = luax_checkdata(L, 1);
 			d->retain();
@@ -104,14 +104,14 @@ int w_newTrueTypeRasterizer(lua_State *L)
 		);
 	}
 
-	luax_pushtype(L, FONT_RASTERIZER_ID, t);
+	luax_pushtype(L, Rasterizer::type, t);
 	t->release();
 	return 1;
 }
 
 static void convimagedata(lua_State *L, int idx)
 {
-	if (lua_type(L, 1) == LUA_TSTRING || luax_istype(L, idx, FILESYSTEM_FILE_ID) || luax_istype(L, idx, FILESYSTEM_FILE_DATA_ID))
+	if (lua_type(L, 1) == LUA_TSTRING || luax_istype(L, idx, love::filesystem::File::type) || luax_istype(L, idx, love::filesystem::FileData::type))
 		luax_convobj(L, idx, "image", "newImageData");
 }
 
@@ -129,7 +129,7 @@ int w_newBMFontRasterizer(lua_State *L)
 			lua_rawgeti(L, 2, i);
 
 			convimagedata(L, -1);
-			image::ImageData *id = luax_checktype<image::ImageData>(L, -1, IMAGE_IMAGE_DATA_ID);
+			image::ImageData *id = luax_checktype<image::ImageData>(L, -1, image::ImageData::type);
 			images.push_back(id);
 			id->retain();
 
@@ -141,7 +141,7 @@ int w_newBMFontRasterizer(lua_State *L)
 		for (int i = 2; i <= lua_gettop(L); i++)
 		{
 			convimagedata(L, i);
-			image::ImageData *id = luax_checktype<image::ImageData>(L, i, IMAGE_IMAGE_DATA_ID);
+			image::ImageData *id = luax_checktype<image::ImageData>(L, i, image::ImageData::type);
 			images.push_back(id);
 			id->retain();
 		}
@@ -152,7 +152,7 @@ int w_newBMFontRasterizer(lua_State *L)
 		[&](bool) { d->release(); for (auto id : images) id->release(); }
 	);
 
-	luax_pushtype(L, FONT_RASTERIZER_ID, t);
+	luax_pushtype(L, Rasterizer::type, t);
 	t->release();
 	return 1;
 }
@@ -163,13 +163,13 @@ int w_newImageRasterizer(lua_State *L)
 
 	convimagedata(L, 1);
 
-	image::ImageData *d = luax_checktype<image::ImageData>(L, 1, IMAGE_IMAGE_DATA_ID);
+	image::ImageData *d = luax_checktype<image::ImageData>(L, 1, image::ImageData::type);
 	std::string glyphs = luax_checkstring(L, 2);
 	int extraspacing = (int) luaL_optnumber(L, 3, 0);
 
 	luax_catchexcept(L, [&](){ t = instance()->newImageRasterizer(d, glyphs, extraspacing); });
 
-	luax_pushtype(L, FONT_RASTERIZER_ID, t);
+	luax_pushtype(L, Rasterizer::type, t);
 	t->release();
 	return 1;
 }
@@ -191,7 +191,7 @@ int w_newGlyphData(lua_State *L)
 		t = instance()->newGlyphData(r, g);
 	}
 
-	luax_pushtype(L, FONT_GLYPH_DATA_ID, t);
+	luax_pushtype(L, GlyphData::type, t);
 	t->release();
 	return 1;
 }
@@ -227,7 +227,7 @@ extern "C" int luaopen_love_font(lua_State *L)
 	WrappedModule w;
 	w.module = instance;
 	w.name = "font";
-	w.type = MODULE_ID;
+	w.type = &Module::type;
 	w.functions = functions;
 	w.types = types;
 
diff --git a/src/modules/font/wrap_GlyphData.cpp b/src/modules/font/wrap_GlyphData.cpp
index e97a42b62..a605562d6 100644
--- a/src/modules/font/wrap_GlyphData.cpp
+++ b/src/modules/font/wrap_GlyphData.cpp
@@ -27,7 +27,7 @@ namespace font
 
 GlyphData *luax_checkglyphdata(lua_State *L, int idx)
 {
-	return luax_checktype<GlyphData>(L, idx, FONT_GLYPH_DATA_ID);
+	return luax_checktype<GlyphData>(L, idx, GlyphData::type);
 }
 
 int w_GlyphData_getWidth(lua_State *L)
@@ -131,7 +131,7 @@ const luaL_Reg w_GlyphData_functions[] =
 
 extern "C" int luaopen_glyphdata(lua_State *L)
 {
-	return luax_register_type(L, FONT_GLYPH_DATA_ID, "GlyphData", w_Data_functions, w_GlyphData_functions, nullptr);
+	return luax_register_type(L, GlyphData::type, "GlyphData", w_Data_functions, w_GlyphData_functions, nullptr);
 }
 
 } // font
diff --git a/src/modules/font/wrap_Rasterizer.cpp b/src/modules/font/wrap_Rasterizer.cpp
index 87345e051..76047de6a 100644
--- a/src/modules/font/wrap_Rasterizer.cpp
+++ b/src/modules/font/wrap_Rasterizer.cpp
@@ -29,7 +29,7 @@ namespace font
 
 Rasterizer *luax_checkrasterizer(lua_State *L, int idx)
 {
-	return luax_checktype<Rasterizer>(L, idx, FONT_RASTERIZER_ID);
+	return luax_checktype<Rasterizer>(L, idx, Rasterizer::type);
 }
 
 int w_Rasterizer_getHeight(lua_State *L)
@@ -86,7 +86,7 @@ int w_Rasterizer_getGlyphData(lua_State *L)
 		}
 	});
 
-	luax_pushtype(L, FONT_GLYPH_DATA_ID, g);
+	luax_pushtype(L, GlyphData::type, g);
 	g->release();
 	return 1;
 }
@@ -139,7 +139,7 @@ const luaL_Reg w_Rasterizer_functions[] =
 
 extern "C" int luaopen_rasterizer(lua_State *L)
 {
-	return luax_register_type(L, FONT_RASTERIZER_ID, "Rasterizer", w_Rasterizer_functions, nullptr);
+	return luax_register_type(L, Rasterizer::type, "Rasterizer", w_Rasterizer_functions, nullptr);
 }
 
 } // font
diff --git a/src/modules/graphics/Drawable.h b/src/modules/graphics/Drawable.h
index cc8919ce9..8c3288b5e 100644
--- a/src/modules/graphics/Drawable.h
+++ b/src/modules/graphics/Drawable.h
@@ -38,6 +38,8 @@ class Drawable : public Object
 {
 public:
 
+	static love::Type type;
+
 	/**
 	 * Destructor.
 	 **/
diff --git a/src/modules/graphics/Graphics.cpp b/src/modules/graphics/Graphics.cpp
index 7280ef200..64ca2cc5d 100644
--- a/src/modules/graphics/Graphics.cpp
+++ b/src/modules/graphics/Graphics.cpp
@@ -58,6 +58,8 @@ void unGammaCorrectColor(Colorf &c)
 	}
 }
 
+love::Type Graphics::type(&Module::type);
+
 Graphics::~Graphics()
 {
 }
diff --git a/src/modules/graphics/Graphics.h b/src/modules/graphics/Graphics.h
index 06e55db5e..6c59d1271 100644
--- a/src/modules/graphics/Graphics.h
+++ b/src/modules/graphics/Graphics.h
@@ -63,6 +63,8 @@ class Graphics : public Module
 {
 public:
 
+	static love::Type type;
+
 	enum DrawMode
 	{
 		DRAW_LINE,
diff --git a/src/modules/graphics/ParticleSystem.cpp b/src/modules/graphics/ParticleSystem.cpp
index d99dd91b0..2f496054c 100644
--- a/src/modules/graphics/ParticleSystem.cpp
+++ b/src/modules/graphics/ParticleSystem.cpp
@@ -50,6 +50,8 @@ float calculate_variation(float inner, float outer, float var)
 
 } // anonymous namespace
 
+love::Type ParticleSystem::type(&Drawable::type);
+
 ParticleSystem::ParticleSystem(Texture *texture, uint32 size)
 	: pMem(nullptr)
 	, pFree(nullptr)
diff --git a/src/modules/graphics/ParticleSystem.h b/src/modules/graphics/ParticleSystem.h
index b95941c30..c0dddd26b 100644
--- a/src/modules/graphics/ParticleSystem.h
+++ b/src/modules/graphics/ParticleSystem.h
@@ -45,6 +45,9 @@ namespace graphics
 class ParticleSystem : public Drawable
 {
 public:
+
+	static love::Type type;
+
 	/**
 	 * Type of distribution new particles are drawn from: None, uniform, normal, ellipse.
 	 */
diff --git a/src/modules/graphics/Quad.cpp b/src/modules/graphics/Quad.cpp
index 2bc656c94..833d81be0 100644
--- a/src/modules/graphics/Quad.cpp
+++ b/src/modules/graphics/Quad.cpp
@@ -29,6 +29,8 @@ namespace love
 namespace graphics
 {
 
+love::Type Quad::type(&Object::type);
+
 Quad::Quad(const Quad::Viewport &v, double sw, double sh)
 	: sw(sw)
 	, sh(sh)
diff --git a/src/modules/graphics/Quad.h b/src/modules/graphics/Quad.h
index 26e06f3d8..82874dd82 100644
--- a/src/modules/graphics/Quad.h
+++ b/src/modules/graphics/Quad.h
@@ -34,6 +34,8 @@ class Quad : public Object
 {
 public:
 
+	static love::Type type;
+
 	struct Viewport
 	{
 		double x, y;
diff --git a/src/modules/graphics/Texture.cpp b/src/modules/graphics/Texture.cpp
index 0da22e6bb..8bdaae19b 100644
--- a/src/modules/graphics/Texture.cpp
+++ b/src/modules/graphics/Texture.cpp
@@ -25,6 +25,8 @@ namespace love
 namespace graphics
 {
 
+love::Type Texture::type(&Drawable::type);
+
 Texture::Filter Texture::defaultFilter;
 
 Texture::Texture()
diff --git a/src/modules/graphics/Texture.h b/src/modules/graphics/Texture.h
index 70fc932a2..60179d575 100644
--- a/src/modules/graphics/Texture.h
+++ b/src/modules/graphics/Texture.h
@@ -40,6 +40,8 @@ class Texture : public Drawable
 {
 public:
 
+	static love::Type type;
+
 	enum WrapMode
 	{
 		WRAP_CLAMP,
diff --git a/src/modules/graphics/opengl/Canvas.cpp b/src/modules/graphics/opengl/Canvas.cpp
index 51d80bbc3..efd12efd6 100644
--- a/src/modules/graphics/opengl/Canvas.cpp
+++ b/src/modules/graphics/opengl/Canvas.cpp
@@ -88,6 +88,7 @@ static GLenum createMSAABuffer(int width, int height, int &samples, GLenum iform
 	return status;
 }
 
+love::Type Canvas::type(&Texture::type);
 Canvas *Canvas::current = nullptr;
 OpenGL::Viewport Canvas::systemViewport = OpenGL::Viewport();
 bool Canvas::screenHasSRGB = false;
diff --git a/src/modules/graphics/opengl/Canvas.h b/src/modules/graphics/opengl/Canvas.h
index 03d829bd9..da6f63547 100644
--- a/src/modules/graphics/opengl/Canvas.h
+++ b/src/modules/graphics/opengl/Canvas.h
@@ -43,6 +43,8 @@ class Canvas : public Texture, public Volatile
 {
 public:
 
+	static love::Type type;
+
 	// Different Canvas render target formats.
 	enum Format
 	{
diff --git a/src/modules/graphics/opengl/Font.cpp b/src/modules/graphics/opengl/Font.cpp
index aed92c740..ebae44ab9 100644
--- a/src/modules/graphics/opengl/Font.cpp
+++ b/src/modules/graphics/opengl/Font.cpp
@@ -39,6 +39,8 @@ namespace graphics
 namespace opengl
 {
 
+love::Type Font::type(&Object::type);
+
 static inline uint16 normToUint16(double n)
 {
 	return (uint16) (n * LOVE_UINT16_MAX);
@@ -77,7 +79,7 @@ Font::Font(love::font::Rasterizer *r, const Texture::Filter &filter)
 	}
 
 	love::font::GlyphData *gd = r->getGlyphData(32); // Space character.
-	type = (gd->getFormat() == font::GlyphData::FORMAT_LUMINANCE_ALPHA) ? FONT_TRUETYPE : FONT_IMAGE;
+	fontType = (gd->getFormat() == font::GlyphData::FORMAT_LUMINANCE_ALPHA) ? FONT_TRUETYPE : FONT_IMAGE;
 	gd->release();
 
 	if (!r->hasGlyph(9)) // No tab character in the Rasterizer.
@@ -142,7 +144,7 @@ void Font::createTexture()
 {
 	OpenGL::TempDebugGroup debuggroup("Font create texture");
 
-	size_t bpp = type == FONT_TRUETYPE ? 2 : 4;
+	size_t bpp = fontType == FONT_TRUETYPE ? 2 : 4;
 
 	size_t prevmemsize = textureMemorySize;
 	if (prevmemsize > 0)
@@ -177,7 +179,7 @@ void Font::createTexture()
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
 	GLenum internalformat = GL_RGBA;
-	GLenum format = getTextureFormat(type, &internalformat);
+	GLenum format = getTextureFormat(fontType, &internalformat);
 
 	// Initialize the texture with transparent black.
 	std::vector<GLubyte> emptydata(size.width * size.height * bpp, 0);
@@ -285,7 +287,7 @@ const Font::Glyph &Font::addGlyph(uint32 glyph)
 	// don't waste space for empty glyphs. also fixes a divide by zero bug with ATI drivers
 	if (w > 0 && h > 0)
 	{
-		GLenum format = getTextureFormat(type);
+		GLenum format = getTextureFormat(fontType);
 		g.texture = textures.back();
 
 		gl.bindTextureToUnit(g.texture, 0, false);
@@ -1021,7 +1023,7 @@ int Font::getDescent() const
 float Font::getBaseline() const
 {
 	// 1.25 is magic line height for true type fonts
-	return (type == FONT_TRUETYPE) ? floorf(getHeight() / 1.25f + 0.5f) : 0.0f;
+	return (fontType == FONT_TRUETYPE) ? floorf(getHeight() / 1.25f + 0.5f) : 0.0f;
 }
 
 bool Font::hasGlyph(uint32 glyph) const
@@ -1065,7 +1067,7 @@ void Font::setFallbacks(const std::vector<Font *> &fallbacks)
 {
 	for (const Font *f : fallbacks)
 	{
-		if (f->type != this->type)
+		if (f->fontType != this->fontType)
 			throw love::Exception("Font fallbacks must be of the same font type.");
 	}
 
diff --git a/src/modules/graphics/opengl/Font.h b/src/modules/graphics/opengl/Font.h
index ed55a41a4..62d6e3ac1 100644
--- a/src/modules/graphics/opengl/Font.h
+++ b/src/modules/graphics/opengl/Font.h
@@ -50,6 +50,8 @@ class Font : public Object, public Volatile
 {
 public:
 
+	static love::Type type;
+
 	typedef std::vector<uint32> Codepoints;
 
 	enum AlignMode
@@ -235,7 +237,7 @@ private:
 	// map of left/right glyph pairs to horizontal kerning.
 	std::unordered_map<uint64, float> kerning;
 
-	FontType type;
+	FontType fontType;
 	Texture::Filter filter;
 
 	int textureX, textureY;
diff --git a/src/modules/graphics/opengl/Image.cpp b/src/modules/graphics/opengl/Image.cpp
index 73b6fae81..06a8feb97 100644
--- a/src/modules/graphics/opengl/Image.cpp
+++ b/src/modules/graphics/opengl/Image.cpp
@@ -43,6 +43,8 @@ namespace graphics
 namespace opengl
 {
 
+love::Type Image::type(&Texture::type);
+
 int Image::imageCount = 0;
 
 float Image::maxMipmapSharpness = 0.0f;
diff --git a/src/modules/graphics/opengl/Image.h b/src/modules/graphics/opengl/Image.h
index 0df3df0cf..9c0fedeff 100644
--- a/src/modules/graphics/opengl/Image.h
+++ b/src/modules/graphics/opengl/Image.h
@@ -52,6 +52,8 @@ class Image : public Texture, public Volatile
 {
 public:
 
+	static love::Type type;
+
 	enum FlagType
 	{
 		FLAG_TYPE_MIPMAPS,
diff --git a/src/modules/graphics/opengl/Mesh.cpp b/src/modules/graphics/opengl/Mesh.cpp
index 8d7e7e87b..b95fb1858 100644
--- a/src/modules/graphics/opengl/Mesh.cpp
+++ b/src/modules/graphics/opengl/Mesh.cpp
@@ -58,6 +58,8 @@ static std::vector<Mesh::AttribFormat> getDefaultVertexFormat()
 	return vertexformat;
 }
 
+love::Type Mesh::type(&Drawable::type);
+
 Mesh::Mesh(const std::vector<AttribFormat> &vertexformat, const void *data, size_t datasize, DrawMode drawmode, Usage usage)
 	: vertexFormat(vertexformat)
 	, vbo(nullptr)
diff --git a/src/modules/graphics/opengl/Mesh.h b/src/modules/graphics/opengl/Mesh.h
index 19ba61097..df7e383a7 100644
--- a/src/modules/graphics/opengl/Mesh.h
+++ b/src/modules/graphics/opengl/Mesh.h
@@ -50,6 +50,8 @@ class Mesh : public Drawable
 {
 public:
 
+	static love::Type type;
+
 	// The expected usage pattern of the Mesh's vertex data.
 	enum Usage
 	{
diff --git a/src/modules/graphics/opengl/Shader.cpp b/src/modules/graphics/opengl/Shader.cpp
index 8f5b8ddc9..80bac9117 100644
--- a/src/modules/graphics/opengl/Shader.cpp
+++ b/src/modules/graphics/opengl/Shader.cpp
@@ -62,6 +62,7 @@ namespace
 } // anonymous namespace
 
 
+love::Type Shader::type(&Object::type);
 Shader *Shader::current = nullptr;
 Shader *Shader::defaultShader = nullptr;
 Shader *Shader::defaultVideoShader = nullptr;
diff --git a/src/modules/graphics/opengl/Shader.h b/src/modules/graphics/opengl/Shader.h
index 61915061f..c54104e89 100644
--- a/src/modules/graphics/opengl/Shader.h
+++ b/src/modules/graphics/opengl/Shader.h
@@ -48,6 +48,8 @@ class Shader : public Object, public Volatile
 {
 public:
 
+	static love::Type type;
+
 	enum ShaderStage
 	{
 		STAGE_VERTEX,
diff --git a/src/modules/graphics/opengl/SpriteBatch.cpp b/src/modules/graphics/opengl/SpriteBatch.cpp
index 12a8aa2f3..0a66d3b4d 100644
--- a/src/modules/graphics/opengl/SpriteBatch.cpp
+++ b/src/modules/graphics/opengl/SpriteBatch.cpp
@@ -41,6 +41,8 @@ namespace graphics
 namespace opengl
 {
 
+love::Type SpriteBatch::type(&Drawable::type);
+
 SpriteBatch::SpriteBatch(Texture *texture, int size, Mesh::Usage usage)
 	: texture(texture)
 	, size(size)
diff --git a/src/modules/graphics/opengl/SpriteBatch.h b/src/modules/graphics/opengl/SpriteBatch.h
index f33726f5a..8824f5b39 100644
--- a/src/modules/graphics/opengl/SpriteBatch.h
+++ b/src/modules/graphics/opengl/SpriteBatch.h
@@ -52,6 +52,8 @@ class SpriteBatch : public Drawable
 {
 public:
 
+	static love::Type type;
+
 	SpriteBatch(Texture *texture, int size, Mesh::Usage usage);
 	virtual ~SpriteBatch();
 
diff --git a/src/modules/graphics/opengl/Text.cpp b/src/modules/graphics/opengl/Text.cpp
index 76aafadd6..dbebc8bd9 100644
--- a/src/modules/graphics/opengl/Text.cpp
+++ b/src/modules/graphics/opengl/Text.cpp
@@ -30,6 +30,8 @@ namespace graphics
 namespace opengl
 {
 
+love::Type Text::type(&Drawable::type);
+
 Text::Text(Font *font, const std::vector<Font::ColoredString> &text)
 	: font(font)
 	, vbo(nullptr)
diff --git a/src/modules/graphics/opengl/Text.h b/src/modules/graphics/opengl/Text.h
index c1ef777cd..e91590b8d 100644
--- a/src/modules/graphics/opengl/Text.h
+++ b/src/modules/graphics/opengl/Text.h
@@ -38,6 +38,8 @@ class Text : public Drawable
 {
 public:
 
+	static love::Type type;
+
 	Text(Font *font, const std::vector<Font::ColoredString> &text = {});
 	virtual ~Text();
 
diff --git a/src/modules/graphics/opengl/Video.cpp b/src/modules/graphics/opengl/Video.cpp
index 4f452dc59..bea0b5ae0 100644
--- a/src/modules/graphics/opengl/Video.cpp
+++ b/src/modules/graphics/opengl/Video.cpp
@@ -30,6 +30,8 @@ namespace graphics
 namespace opengl
 {
 
+love::Type Video::type(&Drawable::type);
+
 Video::Video(love::video::VideoStream *stream)
 	: stream(stream)
 	, filter(Texture::getDefaultFilter())
diff --git a/src/modules/graphics/opengl/Video.h b/src/modules/graphics/opengl/Video.h
index 2f9593f74..1813c2742 100644
--- a/src/modules/graphics/opengl/Video.h
+++ b/src/modules/graphics/opengl/Video.h
@@ -40,6 +40,8 @@ class Video : public Drawable, public Volatile
 {
 public:
 
+	static love::Type type;
+
 	Video(love::video::VideoStream *stream);
 	~Video();
 
diff --git a/src/modules/graphics/opengl/wrap_Canvas.cpp b/src/modules/graphics/opengl/wrap_Canvas.cpp
index d1bdd5f3a..0b791079e 100644
--- a/src/modules/graphics/opengl/wrap_Canvas.cpp
+++ b/src/modules/graphics/opengl/wrap_Canvas.cpp
@@ -30,7 +30,7 @@ namespace opengl
 
 Canvas *luax_checkcanvas(lua_State *L, int idx)
 {
-	return luax_checktype<Canvas>(L, idx, GRAPHICS_CANVAS_ID);
+	return luax_checktype<Canvas>(L, idx, Canvas::type);
 }
 
 int w_Canvas_renderTo(lua_State *L)
@@ -68,7 +68,7 @@ int w_Canvas_renderTo(lua_State *L)
 int w_Canvas_newImageData(lua_State *L)
 {
 	Canvas *canvas = luax_checkcanvas(L, 1);
-	love::image::Image *image = luax_getmodule<love::image::Image>(L, MODULE_IMAGE_ID);
+	love::image::Image *image = luax_getmodule<love::image::Image>(L, love::image::Image::type);
 	int x = (int) luaL_optnumber(L, 2, 0);
 	int y = (int) luaL_optnumber(L, 3, 0);
 	int w = (int) luaL_optnumber(L, 4, canvas->getWidth());
@@ -77,7 +77,7 @@ int w_Canvas_newImageData(lua_State *L)
 	love::image::ImageData *img = nullptr;
 	luax_catchexcept(L, [&](){ img = canvas->newImageData(image, x, y, w, h); });
 
-	luax_pushtype(L, IMAGE_IMAGE_DATA_ID, img);
+	luax_pushtype(L, love::image::ImageData::type, img);
 	img->release();
 	return 1;
 }
@@ -112,7 +112,7 @@ static const luaL_Reg w_Canvas_functions[] =
 
 extern "C" int luaopen_canvas(lua_State *L)
 {
-	return luax_register_type(L, GRAPHICS_CANVAS_ID, "Canvas", w_Texture_functions, w_Canvas_functions, nullptr);
+	return luax_register_type(L, Canvas::type, "Canvas", w_Texture_functions, w_Canvas_functions, nullptr);
 }
 
 } // opengl
diff --git a/src/modules/graphics/opengl/wrap_Font.cpp b/src/modules/graphics/opengl/wrap_Font.cpp
index b6a84d071..0bf83569e 100644
--- a/src/modules/graphics/opengl/wrap_Font.cpp
+++ b/src/modules/graphics/opengl/wrap_Font.cpp
@@ -35,7 +35,7 @@ namespace opengl
 
 Font *luax_checkfont(lua_State *L, int idx)
 {
-	return luax_checktype<Font>(L, idx, GRAPHICS_FONT_ID);
+	return luax_checktype<Font>(L, idx, Font::type);
 }
 
 int w_Font_getHeight(lua_State *L)
@@ -207,7 +207,7 @@ static const luaL_Reg w_Font_functions[] =
 
 extern "C" int luaopen_font(lua_State *L)
 {
-	return luax_register_type(L, GRAPHICS_FONT_ID, "Font", w_Font_functions, nullptr);
+	return luax_register_type(L, Font::type, "Font", w_Font_functions, nullptr);
 }
 
 } // opengl
diff --git a/src/modules/graphics/opengl/wrap_Graphics.cpp b/src/modules/graphics/opengl/wrap_Graphics.cpp
index 99ee0e37b..ae0eaeddd 100644
--- a/src/modules/graphics/opengl/wrap_Graphics.cpp
+++ b/src/modules/graphics/opengl/wrap_Graphics.cpp
@@ -313,7 +313,7 @@ int w_newImage(lua_State *L)
 	bool releasedata = false;
 
 	// Convert to ImageData / CompressedImageData, if necessary.
-	if (lua_isstring(L, 1) || luax_istype(L, 1, FILESYSTEM_FILE_ID) || luax_istype(L, 1, FILESYSTEM_FILE_DATA_ID))
+	if (lua_isstring(L, 1) || luax_istype(L, 1, love::filesystem::File::type) || luax_istype(L, 1, love::filesystem::FileData::type))
 	{
 		auto imagemodule = Module::getInstance<love::image::Image>(Module::M_IMAGE);
 		if (imagemodule == nullptr)
@@ -339,7 +339,7 @@ int w_newImage(lua_State *L)
 		// Lua's GC won't release the image data, so we should do it ourselves.
 		releasedata = true;
 	}
-	else if (luax_istype(L, 1, IMAGE_COMPRESSED_IMAGE_DATA_ID))
+	else if (luax_istype(L, 1, love::image::CompressedImageData::type))
 		cdata.push_back(love::image::luax_checkcompressedimagedata(L, 1));
 	else
 		data.push_back(love::image::luax_checkimagedata(L, 1));
@@ -358,14 +358,14 @@ int w_newImage(lua_State *L)
 
 				if (!data.empty())
 				{
-					if (!luax_istype(L, -1, IMAGE_IMAGE_DATA_ID))
+					if (!luax_istype(L, -1, love::image::ImageData::type))
 						luax_convobj(L, -1, "image", "newImageData");
 
 					data.push_back(love::image::luax_checkimagedata(L, -1));
 				}
 				else if (!cdata.empty())
 				{
-					if (!luax_istype(L, -1, IMAGE_COMPRESSED_IMAGE_DATA_ID))
+					if (!luax_istype(L, -1, love::image::CompressedImageData::type))
 						luax_convobj(L, -1, "image", "newCompressedData");
 
 					cdata.push_back(love::image::luax_checkcompressedimagedata(L, -1));
@@ -402,7 +402,7 @@ int w_newImage(lua_State *L)
 		return luaL_error(L, "Could not load image.");
 
 	// Push the type.
-	luax_pushtype(L, GRAPHICS_IMAGE_ID, image);
+	luax_pushtype(L, Image::type, image);
 	image->release();
 	return 1;
 }
@@ -421,7 +421,7 @@ int w_newQuad(lua_State *L)
 	double sh = luaL_checknumber(L, 6);
 
 	Quad *quad = instance()->newQuad(v, sw, sh);
-	luax_pushtype(L, GRAPHICS_QUAD_ID, quad);
+	luax_pushtype(L, Quad::type, quad);
 	quad->release();
 	return 1;
 }
@@ -433,7 +433,7 @@ int w_newFont(lua_State *L)
 	Font *font = nullptr;
 
 	// Convert to Rasterizer, if necessary.
-	if (!luax_istype(L, 1, FONT_RASTERIZER_ID))
+	if (!luax_istype(L, 1, love::font::Rasterizer::type))
 	{
 		std::vector<int> idxs;
 		for (int i = 0; i < lua_gettop(L); i++)
@@ -442,14 +442,14 @@ int w_newFont(lua_State *L)
 		luax_convobj(L, &idxs[0], (int) idxs.size(), "font", "newRasterizer");
 	}
 
-	love::font::Rasterizer *rasterizer = luax_checktype<love::font::Rasterizer>(L, 1, FONT_RASTERIZER_ID);
+	love::font::Rasterizer *rasterizer = luax_checktype<love::font::Rasterizer>(L, 1, love::font::Rasterizer::type);
 
 	luax_catchexcept(L, [&]() {
 		font = instance()->newFont(rasterizer, instance()->getDefaultFilter()); }
 	);
 
 	// Push the type.
-	luax_pushtype(L, GRAPHICS_FONT_ID, font);
+	luax_pushtype(L, Font::type, font);
 	font->release();
 	return 1;
 }
@@ -462,19 +462,19 @@ int w_newImageFont(lua_State *L)
 	Texture::Filter filter = instance()->getDefaultFilter();
 
 	// Convert to ImageData if necessary.
-	if (luax_istype(L, 1, GRAPHICS_IMAGE_ID))
+	if (luax_istype(L, 1, Image::type))
 	{
-		Image *i = luax_checktype<Image>(L, 1, GRAPHICS_IMAGE_ID);
+		Image *i = luax_checktype<Image>(L, 1, Image::type);
 		filter = i->getFilter();
 		const auto &idlevels = i->getImageData();
 		if (idlevels.empty())
 			return luaL_argerror(L, 1, "Image must not be compressed.");
-		luax_pushtype(L, IMAGE_IMAGE_DATA_ID, idlevels[0].get());
+		luax_pushtype(L, love::image::ImageData::type, idlevels[0].get());
 		lua_replace(L, 1);
 	}
 
 	// Convert to Rasterizer if necessary.
-	if (!luax_istype(L, 1, FONT_RASTERIZER_ID))
+	if (!luax_istype(L, 1, love::font::Rasterizer::type))
 	{
 		luaL_checktype(L, 2, LUA_TSTRING);
 
@@ -485,13 +485,13 @@ int w_newImageFont(lua_State *L)
 		luax_convobj(L, &idxs[0], (int) idxs.size(), "font", "newImageRasterizer");
 	}
 
-	love::font::Rasterizer *rasterizer = luax_checktype<love::font::Rasterizer>(L, 1, FONT_RASTERIZER_ID);
+	love::font::Rasterizer *rasterizer = luax_checktype<love::font::Rasterizer>(L, 1, love::font::Rasterizer::type);
 
 	// Create the font.
 	Font *font = instance()->newFont(rasterizer, filter);
 
 	// Push the type.
-	luax_pushtype(L, GRAPHICS_FONT_ID, font);
+	luax_pushtype(L, Font::type, font);
 	font->release();
 	return 1;
 }
@@ -515,7 +515,7 @@ int w_newSpriteBatch(lua_State *L)
 		[&](){ t = instance()->newSpriteBatch(texture, size, usage); }
 	);
 
-	luax_pushtype(L, GRAPHICS_SPRITE_BATCH_ID, t);
+	luax_pushtype(L, SpriteBatch::type, t);
 	t->release();
 	return 1;
 }
@@ -534,7 +534,7 @@ int w_newParticleSystem(lua_State *L)
 		[&](){ t = instance()->newParticleSystem(texture, int(size)); }
 	);
 
-	luax_pushtype(L, GRAPHICS_PARTICLE_SYSTEM_ID, t);
+	luax_pushtype(L, ParticleSystem::type, t);
 	t->release();
 	return 1;
 }
@@ -561,7 +561,7 @@ int w_newCanvas(lua_State *L)
 	if (canvas == nullptr)
 		return luaL_error(L, "Canvas not created, but no error thrown. I don't even...");
 
-	luax_pushtype(L, GRAPHICS_CANVAS_ID, canvas);
+	luax_pushtype(L, Canvas::type, canvas);
 	canvas->release();
 	return 1;
 }
@@ -654,7 +654,7 @@ int w_newShader(lua_State *L)
 	try
 	{
 		Shader *shader = instance()->newShader(source);
-		luax_pushtype(L, GRAPHICS_SHADER_ID, shader);
+		luax_pushtype(L, Shader::type, shader);
 		shader->release();
 	}
 	catch (love::Exception &e)
@@ -803,10 +803,10 @@ static Mesh *newCustomMesh(lua_State *L)
 		int vertexcount = (int) luaL_checknumber(L, 2);
 		luax_catchexcept(L, [&](){ t = instance()->newMesh(vertexformat, vertexcount, drawmode, usage); });
 	}
-	else if (luax_istype(L, 2, DATA_ID))
+	else if (luax_istype(L, 2, Data::type))
 	{
 		// Vertex data comes directly from a Data object.
-		Data *data = luax_checktype<Data>(L, 2, DATA_ID);
+		Data *data = luax_checktype<Data>(L, 2, Data::type);
 		luax_catchexcept(L, [&](){ t = instance()->newMesh(vertexformat, data->getData(), data->getSize(), drawmode, usage); });
 	}
 	else
@@ -886,7 +886,7 @@ int w_newMesh(lua_State *L)
 	else
 		t = newStandardMesh(L);
 
-	luax_pushtype(L, GRAPHICS_MESH_ID, t);
+	luax_pushtype(L, Mesh::type, t);
 	t->release();
 	return 1;
 }
@@ -908,7 +908,7 @@ int w_newText(lua_State *L)
 		luax_catchexcept(L, [&](){ t = instance()->newText(font, text); });
 	}
 
-	luax_pushtype(L, GRAPHICS_TEXT_ID, t);
+	luax_pushtype(L, Text::type, t);
 	t->release();
 	return 1;
 }
@@ -917,14 +917,14 @@ int w_newVideo(lua_State *L)
 {
 	luax_checkgraphicscreated(L);
 
-	if (!luax_istype(L, 1, VIDEO_VIDEO_STREAM_ID))
+	if (!luax_istype(L, 1, love::video::VideoStream::type))
 		luax_convobj(L, 1, "video", "newVideoStream");
 
-	auto stream = luax_checktype<love::video::VideoStream>(L, 1, VIDEO_VIDEO_STREAM_ID);
+	auto stream = luax_checktype<love::video::VideoStream>(L, 1, love::video::VideoStream::type);
 	Video *video = nullptr;
 
 	luax_catchexcept(L, [&]() { video = instance()->newVideo(stream); });
-	luax_pushtype(L, GRAPHICS_VIDEO_ID, video);
+	luax_pushtype(L, Video::type, video);
 	video->release();
 	return 1;
 }
@@ -1004,14 +1004,14 @@ int w_getBackgroundColor(lua_State *L)
 int w_setNewFont(lua_State *L)
 {
 	int ret = w_newFont(L);
-	Font *font = luax_checktype<Font>(L, -1, GRAPHICS_FONT_ID);
+	Font *font = luax_checktype<Font>(L, -1, Font::type);
 	instance()->setFont(font);
 	return ret;
 }
 
 int w_setFont(lua_State *L)
 {
-	Font *font = luax_checktype<Font>(L, 1, GRAPHICS_FONT_ID);
+	Font *font = luax_checktype<Font>(L, 1, Font::type);
 	instance()->setFont(font);
 	return 0;
 }
@@ -1021,7 +1021,7 @@ int w_getFont(lua_State *L)
 	Font *f = nullptr;
 	luax_catchexcept(L, [&](){ f = instance()->getFont(); });
 
-	luax_pushtype(L, GRAPHICS_FONT_ID, f);
+	luax_pushtype(L, Font::type, f);
 	return 1;
 }
 
@@ -1248,13 +1248,13 @@ int w_isWireframe(lua_State *L)
 
 int w_newScreenshot(lua_State *L)
 {
-	love::image::Image *image = luax_getmodule<love::image::Image>(L, MODULE_IMAGE_ID);
+	love::image::Image *image = luax_getmodule<love::image::Image>(L, love::image::Image::type);
 	bool copyAlpha = luax_optboolean(L, 1, false);
 	love::image::ImageData *i = 0;
 
 	luax_catchexcept(L, [&](){ i = instance()->newScreenshot(image, copyAlpha); });
 
-	luax_pushtype(L, IMAGE_IMAGE_DATA_ID, i);
+	luax_pushtype(L, love::image::ImageData::type, i);
 	i->release();
 	return 1;
 }
@@ -1306,7 +1306,7 @@ int w_getCanvas(lua_State *L)
 
 	for (Canvas *c : canvases)
 	{
-		luax_pushtype(L, GRAPHICS_CANVAS_ID, c);
+		luax_pushtype(L, Canvas::type, c);
 		n++;
 	}
 
@@ -1336,7 +1336,7 @@ int w_getShader(lua_State *L)
 {
 	Shader *shader = instance()->getShader();
 	if (shader)
-		luax_pushtype(L, GRAPHICS_SHADER_ID, shader);
+		luax_pushtype(L, Shader::type, shader);
 	else
 		lua_pushnil(L);
 
@@ -1525,10 +1525,10 @@ int w_draw(lua_State *L)
 	Quad *quad = nullptr;
 	int startidx = 2;
 
-	if (luax_istype(L, 2, GRAPHICS_QUAD_ID))
+	if (luax_istype(L, 2, Quad::type))
 	{
 		texture = luax_checktexture(L, 1);
-		quad = luax_totype<Quad>(L, 2, GRAPHICS_QUAD_ID);
+		quad = luax_totype<Quad>(L, 2, Quad::type);
 		startidx = 3;
 	}
 	else if (lua_isnil(L, 2) && !lua_isnoneornil(L, 3))
@@ -1537,7 +1537,7 @@ int w_draw(lua_State *L)
 	}
 	else
 	{
-		drawable = luax_checktype<Drawable>(L, 1, GRAPHICS_DRAWABLE_ID);
+		drawable = luax_checktype<Drawable>(L, 1, Drawable::type);
 		startidx = 2;
 	}
 
@@ -2090,7 +2090,7 @@ static const luaL_Reg functions[] =
 
 static int luaopen_drawable(lua_State *L)
 {
-	return luax_register_type(L, GRAPHICS_DRAWABLE_ID, "Drawable", nullptr);
+	return luax_register_type(L, Drawable::type, "Drawable", nullptr);
 }
 
 // Types for this module.
@@ -2124,7 +2124,7 @@ extern "C" int luaopen_love_graphics(lua_State *L)
 	WrappedModule w;
 	w.module = instance;
 	w.name = "graphics";
-	w.type = MODULE_GRAPHICS_ID;
+	w.type = &Graphics::type;
 	w.functions = functions;
 	w.types = types;
 
diff --git a/src/modules/graphics/opengl/wrap_Image.cpp b/src/modules/graphics/opengl/wrap_Image.cpp
index bf741038d..80c390853 100644
--- a/src/modules/graphics/opengl/wrap_Image.cpp
+++ b/src/modules/graphics/opengl/wrap_Image.cpp
@@ -30,7 +30,7 @@ namespace opengl
 
 Image *luax_checkimage(lua_State *L, int idx)
 {
-	return luax_checktype<Image>(L, idx, GRAPHICS_IMAGE_ID);
+	return luax_checktype<Image>(L, idx, Image::type);
 }
 
 int w_Image_setMipmapFilter(lua_State *L)
@@ -98,7 +98,7 @@ int w_Image_getData(lua_State *L)
 	{
 		for (const auto &cdata : i->getCompressedData())
 		{
-			luax_pushtype(L, IMAGE_COMPRESSED_IMAGE_DATA_ID, cdata.get());
+			luax_pushtype(L, love::image::CompressedImageData::type, cdata.get());
 			n++;
 		}
 	}
@@ -106,7 +106,7 @@ int w_Image_getData(lua_State *L)
 	{
 		for (const auto &data : i->getImageData())
 		{
-			luax_pushtype(L, IMAGE_IMAGE_DATA_ID, data.get());
+			luax_pushtype(L, love::image::ImageData::type, data.get());
 			n++;
 		}
 	}
@@ -150,7 +150,7 @@ static const luaL_Reg w_Image_functions[] =
 
 extern "C" int luaopen_image(lua_State *L)
 {
-	return luax_register_type(L, GRAPHICS_IMAGE_ID, "Image", w_Texture_functions, w_Image_functions, nullptr);
+	return luax_register_type(L, Image::type, "Image", w_Texture_functions, w_Image_functions, nullptr);
 }
 
 } // opengl
diff --git a/src/modules/graphics/opengl/wrap_Mesh.cpp b/src/modules/graphics/opengl/wrap_Mesh.cpp
index 3f730554a..855197739 100644
--- a/src/modules/graphics/opengl/wrap_Mesh.cpp
+++ b/src/modules/graphics/opengl/wrap_Mesh.cpp
@@ -37,7 +37,7 @@ namespace opengl
 
 Mesh *luax_checkmesh(lua_State *L, int idx)
 {
-	return luax_checktype<Mesh>(L, idx, GRAPHICS_MESH_ID);
+	return luax_checktype<Mesh>(L, idx, Mesh::type);
 }
 
 static inline size_t writeByteData(lua_State *L, int startidx, int components, char *data)
@@ -117,9 +117,9 @@ int w_Mesh_setVertices(lua_State *L)
 	size_t stride = t->getVertexStride();
 	size_t byteoffset = vertoffset * stride;
 
-	if (luax_istype(L, 2, DATA_ID))
+	if (luax_istype(L, 2, Data::type))
 	{
-		Data *d = luax_checktype<Data>(L, 2, DATA_ID);
+		Data *d = luax_checktype<Data>(L, 2, Data::type);
 
 		size_t datasize = std::min(d->getSize(), (t->getVertexCount() - vertoffset) * stride);
 		char *bytedata = (char *) t->mapVertexData() + byteoffset;
@@ -437,9 +437,9 @@ int w_Mesh_getTexture(lua_State *L)
 
 	// FIXME: big hack right here.
 	if (typeid(*tex) == typeid(Image))
-		luax_pushtype(L, GRAPHICS_IMAGE_ID, tex);
+		luax_pushtype(L, Image::type, tex);
 	else if (typeid(*tex) == typeid(Canvas))
-		luax_pushtype(L, GRAPHICS_CANVAS_ID, tex);
+		luax_pushtype(L, Canvas::type, tex);
 	else
 		return luaL_error(L, "Unable to determine texture type.");
 
@@ -528,7 +528,7 @@ static const luaL_Reg w_Mesh_functions[] =
 
 extern "C" int luaopen_mesh(lua_State *L)
 {
-	return luax_register_type(L, GRAPHICS_MESH_ID, "Mesh", w_Mesh_functions, nullptr);
+	return luax_register_type(L, Mesh::type, "Mesh", w_Mesh_functions, nullptr);
 }
 
 } // opengl
diff --git a/src/modules/graphics/opengl/wrap_ParticleSystem.cpp b/src/modules/graphics/opengl/wrap_ParticleSystem.cpp
index 5ad69278a..700cac2ca 100644
--- a/src/modules/graphics/opengl/wrap_ParticleSystem.cpp
+++ b/src/modules/graphics/opengl/wrap_ParticleSystem.cpp
@@ -41,7 +41,7 @@ namespace opengl
 
 ParticleSystem *luax_checkparticlesystem(lua_State *L, int idx)
 {
-	return luax_checktype<ParticleSystem>(L, idx, GRAPHICS_PARTICLE_SYSTEM_ID);
+	return luax_checktype<ParticleSystem>(L, idx, ParticleSystem::type);
 }
 
 int w_ParticleSystem_clone(lua_State *L)
@@ -51,7 +51,7 @@ int w_ParticleSystem_clone(lua_State *L)
 	ParticleSystem *clone = nullptr;
 	luax_catchexcept(L, [&](){ clone = t->clone(); });
 
-	luax_pushtype(L, GRAPHICS_PARTICLE_SYSTEM_ID, clone);
+	luax_pushtype(L, ParticleSystem::type, clone);
 	clone->release();
 	return 1;
 }
@@ -71,9 +71,9 @@ int w_ParticleSystem_getTexture(lua_State *L)
 
 	// FIXME: big hack right here.
 	if (typeid(*tex) == typeid(Image))
-		luax_pushtype(L, GRAPHICS_IMAGE_ID, tex);
+		luax_pushtype(L, Image::type, tex);
 	else if (typeid(*tex) == typeid(Canvas))
-		luax_pushtype(L, GRAPHICS_CANVAS_ID, tex);
+		luax_pushtype(L, Canvas::type, tex);
 	else
 		return luaL_error(L, "Unable to determine texture type.");
 
@@ -584,7 +584,7 @@ int w_ParticleSystem_setQuads(lua_State *L)
 		{
 			lua_rawgeti(L, 2, i);
 
-			Quad *q = luax_checktype<Quad>(L, -1, GRAPHICS_QUAD_ID);
+			Quad *q = luax_checktype<Quad>(L, -1, Quad::type);
 			quads.push_back(q);
 
 			lua_pop(L, 1);
@@ -594,7 +594,7 @@ int w_ParticleSystem_setQuads(lua_State *L)
 	{
 		for (int i = 2; i <= lua_gettop(L); i++)
 		{
-			Quad *q = luax_checktype<Quad>(L, i, GRAPHICS_QUAD_ID);
+			Quad *q = luax_checktype<Quad>(L, i, Quad::type);
 			quads.push_back(q);
 		}
 	}
@@ -612,7 +612,7 @@ int w_ParticleSystem_getQuads(lua_State *L)
 
 	for (int i = 0; i < (int) quads.size(); i++)
 	{
-		luax_pushtype(L, GRAPHICS_QUAD_ID, quads[i]);
+		luax_pushtype(L, Quad::type, quads[i]);
 		lua_rawseti(L, -2, i + 1);
 	}
 
@@ -772,7 +772,7 @@ static const luaL_Reg w_ParticleSystem_functions[] =
 
 extern "C" int luaopen_particlesystem(lua_State *L)
 {
-	return luax_register_type(L, GRAPHICS_PARTICLE_SYSTEM_ID, "ParticleSystem", w_ParticleSystem_functions, nullptr);
+	return luax_register_type(L, ParticleSystem::type, "ParticleSystem", w_ParticleSystem_functions, nullptr);
 }
 
 } // opengl
diff --git a/src/modules/graphics/opengl/wrap_Shader.cpp b/src/modules/graphics/opengl/wrap_Shader.cpp
index 5929af41c..28d8bc5d1 100644
--- a/src/modules/graphics/opengl/wrap_Shader.cpp
+++ b/src/modules/graphics/opengl/wrap_Shader.cpp
@@ -35,7 +35,7 @@ namespace opengl
 
 Shader *luax_checkshader(lua_State *L, int idx)
 {
-	return luax_checktype<Shader>(L, idx, GRAPHICS_SHADER_ID);
+	return luax_checktype<Shader>(L, idx, Shader::type);
 }
 
 int w_Shader_getWarnings(lua_State *L)
@@ -317,7 +317,7 @@ static const luaL_Reg w_Shader_functions[] =
 
 extern "C" int luaopen_shader(lua_State *L)
 {
-	return luax_register_type(L, GRAPHICS_SHADER_ID, "Shader", w_Shader_functions, nullptr);
+	return luax_register_type(L, Shader::type, "Shader", w_Shader_functions, nullptr);
 }
 
 } // opengl
diff --git a/src/modules/graphics/opengl/wrap_SpriteBatch.cpp b/src/modules/graphics/opengl/wrap_SpriteBatch.cpp
index 06b0312da..93e4606ef 100644
--- a/src/modules/graphics/opengl/wrap_SpriteBatch.cpp
+++ b/src/modules/graphics/opengl/wrap_SpriteBatch.cpp
@@ -36,16 +36,16 @@ namespace opengl
 
 SpriteBatch *luax_checkspritebatch(lua_State *L, int idx)
 {
-	return luax_checktype<SpriteBatch>(L, idx, GRAPHICS_SPRITE_BATCH_ID);
+	return luax_checktype<SpriteBatch>(L, idx, SpriteBatch::type);
 }
 
 static inline int w_SpriteBatch_add_or_set(lua_State *L, SpriteBatch *t, int startidx, int index)
 {
 	Quad *quad = nullptr;
 
-	if (luax_istype(L, startidx, GRAPHICS_QUAD_ID))
+	if (luax_istype(L, startidx, Quad::type))
 	{
-		quad = luax_totype<Quad>(L, startidx, GRAPHICS_QUAD_ID);
+		quad = luax_totype<Quad>(L, startidx, Quad::type);
 		startidx++;
 	}
 	else if (lua_isnil(L, startidx) && !lua_isnoneornil(L, startidx + 1))
@@ -122,9 +122,9 @@ int w_SpriteBatch_getTexture(lua_State *L)
 
 	// FIXME: big hack right here.
 	if (typeid(*tex) == typeid(Image))
-		luax_pushtype(L, GRAPHICS_IMAGE_ID, tex);
+		luax_pushtype(L, Image::type, tex);
 	else if (typeid(*tex) == typeid(Canvas))
-		luax_pushtype(L, GRAPHICS_CANVAS_ID, tex);
+		luax_pushtype(L, Canvas::type, tex);
 	else
 		return luaL_error(L, "Unable to determine texture type.");
 
@@ -201,7 +201,7 @@ int w_SpriteBatch_attachAttribute(lua_State *L)
 {
 	SpriteBatch *t = luax_checkspritebatch(L, 1);
 	const char *name = luaL_checkstring(L, 2);
-	Mesh *m = luax_checktype<Mesh>(L, 3, GRAPHICS_MESH_ID);
+	Mesh *m = luax_checktype<Mesh>(L, 3, Mesh::type);
 
 	luax_catchexcept(L, [&](){ t->attachAttribute(name, m); });
 	return 0;
@@ -257,7 +257,7 @@ static const luaL_Reg w_SpriteBatch_functions[] =
 
 extern "C" int luaopen_spritebatch(lua_State *L)
 {
-	return luax_register_type(L, GRAPHICS_SPRITE_BATCH_ID, "SpriteBatch", w_SpriteBatch_functions, nullptr);
+	return luax_register_type(L, SpriteBatch::type, "SpriteBatch", w_SpriteBatch_functions, nullptr);
 }
 
 } // opengl
diff --git a/src/modules/graphics/opengl/wrap_Text.cpp b/src/modules/graphics/opengl/wrap_Text.cpp
index 793b7ad11..df965e812 100644
--- a/src/modules/graphics/opengl/wrap_Text.cpp
+++ b/src/modules/graphics/opengl/wrap_Text.cpp
@@ -29,7 +29,7 @@ namespace opengl
 
 Text *luax_checktext(lua_State *L, int idx)
 {
-	return luax_checktype<Text>(L, idx, GRAPHICS_TEXT_ID);
+	return luax_checktype<Text>(L, idx, Text::type);
 }
 
 void luax_checkcoloredstring(lua_State *L, int idx, std::vector<Font::ColoredString> &strings)
@@ -190,7 +190,7 @@ int w_Text_clear(lua_State *L)
 int w_Text_setFont(lua_State *L)
 {
 	Text *t = luax_checktext(L, 1);
-	Font *f = luax_checktype<Font>(L, 2, GRAPHICS_FONT_ID);
+	Font *f = luax_checktype<Font>(L, 2, Font::type);
 	luax_catchexcept(L, [&](){ t->setFont(f); });
 	return 0;
 }
@@ -199,7 +199,7 @@ int w_Text_getFont(lua_State *L)
 {
 	Text *t = luax_checktext(L, 1);
 	Font *f = t->getFont();
-	luax_pushtype(L, GRAPHICS_FONT_ID, f);
+	luax_pushtype(L, Font::type, f);
 	return 1;
 }
 
@@ -245,7 +245,7 @@ static const luaL_Reg w_Text_functions[] =
 
 extern "C" int luaopen_text(lua_State *L)
 {
-	return luax_register_type(L, GRAPHICS_TEXT_ID, "Text", w_Text_functions, nullptr);
+	return luax_register_type(L, Text::type, "Text", w_Text_functions, nullptr);
 }
 
 } // opengl
diff --git a/src/modules/graphics/opengl/wrap_Video.cpp b/src/modules/graphics/opengl/wrap_Video.cpp
index ce2d8114c..fb6966e06 100644
--- a/src/modules/graphics/opengl/wrap_Video.cpp
+++ b/src/modules/graphics/opengl/wrap_Video.cpp
@@ -34,13 +34,13 @@ namespace opengl
 
 Video *luax_checkvideo(lua_State *L, int idx)
 {
-	return luax_checktype<Video>(L, idx, GRAPHICS_VIDEO_ID);
+	return luax_checktype<Video>(L, idx, Video::type);
 }
 
 int w_Video_getStream(lua_State *L)
 {
 	Video *video = luax_checkvideo(L, 1);
-	luax_pushtype(L, VIDEO_VIDEO_STREAM_ID, video->getStream());
+	luax_pushtype(L, love::video::VideoStream::type, video->getStream());
 	return 1;
 }
 
@@ -49,7 +49,7 @@ int w_Video_getSource(lua_State *L)
 	Video *video = luax_checkvideo(L, 1);
 	auto source = video->getSource();
 	if (source)
-		luax_pushtype(L, AUDIO_SOURCE_ID, video->getSource());
+		luax_pushtype(L, love::audio::Source::type, video->getSource());
 	else
 		lua_pushnil(L);
 	return 1;
@@ -62,7 +62,7 @@ int w_Video_setSource(lua_State *L)
 		video->setSource(nullptr);
 	else
 	{
-		auto source = luax_checktype<love::audio::Source>(L, 2, AUDIO_SOURCE_ID);
+		auto source = luax_checktype<love::audio::Source>(L, 2, love::audio::Source::type);
 		video->setSource(source);
 	}
 	return 0;
@@ -143,10 +143,10 @@ static const luaL_Reg functions[] =
 
 int luaopen_video(lua_State *L)
 {
-	int ret = luax_register_type(L, GRAPHICS_VIDEO_ID, "Video", functions, nullptr);
+	int ret = luax_register_type(L, Video::type, "Video", functions, nullptr);
 
 	luaL_loadbuffer(L, video_lua, sizeof(video_lua), "Video.lua");
-	luax_gettypemetatable(L, GRAPHICS_VIDEO_ID);
+	luax_gettypemetatable(L, Video::type);
 	lua_call(L, 1, 0);
 
 	return ret;
diff --git a/src/modules/graphics/wrap_Quad.cpp b/src/modules/graphics/wrap_Quad.cpp
index d6464b950..d352a3c29 100644
--- a/src/modules/graphics/wrap_Quad.cpp
+++ b/src/modules/graphics/wrap_Quad.cpp
@@ -28,7 +28,7 @@ namespace graphics
 
 Quad *luax_checkquad(lua_State *L, int idx)
 {
-	return luax_checktype<Quad>(L, idx, GRAPHICS_QUAD_ID);
+	return luax_checktype<Quad>(L, idx, Quad::type);
 }
 
 int w_Quad_setViewport(lua_State *L)
@@ -84,7 +84,7 @@ static const luaL_Reg w_Quad_functions[] =
 
 extern "C" int luaopen_quad(lua_State *L)
 {
-	return luax_register_type(L, GRAPHICS_QUAD_ID, "Quad", w_Quad_functions, nullptr);
+	return luax_register_type(L, Quad::type, "Quad", w_Quad_functions, nullptr);
 }
 
 } // graphics
diff --git a/src/modules/graphics/wrap_Texture.cpp b/src/modules/graphics/wrap_Texture.cpp
index 406e2bcb3..0bedf0a57 100644
--- a/src/modules/graphics/wrap_Texture.cpp
+++ b/src/modules/graphics/wrap_Texture.cpp
@@ -27,7 +27,7 @@ namespace graphics
 
 Texture *luax_checktexture(lua_State *L, int idx)
 {
-	return luax_checktype<Texture>(L, idx, GRAPHICS_TEXTURE_ID);
+	return luax_checktype<Texture>(L, idx, Texture::type);
 }
 
 int w_Texture_getWidth(lua_State *L)
@@ -139,7 +139,7 @@ const luaL_Reg w_Texture_functions[] =
 
 extern "C" int luaopen_texture(lua_State *L)
 {
-	return luax_register_type(L, GRAPHICS_TEXTURE_ID, "Texture", w_Texture_functions, nullptr);
+	return luax_register_type(L, Texture::type, "Texture", w_Texture_functions, nullptr);
 }
 
 } // graphics
diff --git a/src/modules/image/CompressedImageData.cpp b/src/modules/image/CompressedImageData.cpp
index 4912bf259..faa2fe8ad 100644
--- a/src/modules/image/CompressedImageData.cpp
+++ b/src/modules/image/CompressedImageData.cpp
@@ -25,6 +25,8 @@ namespace love
 namespace image
 {
 
+love::Type CompressedImageData::type(&Data::type);
+
 CompressedImageData::CompressedImageData()
 	: format(FORMAT_UNKNOWN)
 	, sRGB(false)
diff --git a/src/modules/image/CompressedImageData.h b/src/modules/image/CompressedImageData.h
index 40bca701f..9e720c1cf 100644
--- a/src/modules/image/CompressedImageData.h
+++ b/src/modules/image/CompressedImageData.h
@@ -43,6 +43,8 @@ class CompressedImageData : public Data
 {
 public:
 
+	static love::Type type;
+
 	// Recognized compressed image data formats.
 	enum Format
 	{
diff --git a/src/modules/image/Image.h b/src/modules/image/Image.h
index 905d2cfe3..3ee8bf1a2 100644
--- a/src/modules/image/Image.h
+++ b/src/modules/image/Image.h
@@ -44,6 +44,8 @@ class Image : public Module
 {
 public:
 
+	static love::Type type;
+
 	virtual ~Image() {}
 
 	// Implements Module.
diff --git a/src/modules/image/ImageData.cpp b/src/modules/image/ImageData.cpp
index 5766c8931..3a9fc4c35 100644
--- a/src/modules/image/ImageData.cpp
+++ b/src/modules/image/ImageData.cpp
@@ -27,6 +27,8 @@ namespace love
 namespace image
 {
 
+love::Type ImageData::type(&Data::type);
+
 ImageData::ImageData()
 	: data(nullptr)
 {
diff --git a/src/modules/image/ImageData.h b/src/modules/image/ImageData.h
index f78832ec5..f67f59918 100644
--- a/src/modules/image/ImageData.h
+++ b/src/modules/image/ImageData.h
@@ -58,6 +58,8 @@ class ImageData : public Data
 {
 public:
 
+	static love::Type type;
+
 	enum Format
 	{
 		FORMAT_RGBA8,
diff --git a/src/modules/image/wrap_CompressedImageData.cpp b/src/modules/image/wrap_CompressedImageData.cpp
index 382013c30..f383d557c 100644
--- a/src/modules/image/wrap_CompressedImageData.cpp
+++ b/src/modules/image/wrap_CompressedImageData.cpp
@@ -28,7 +28,7 @@ namespace image
 
 CompressedImageData *luax_checkcompressedimagedata(lua_State *L, int idx)
 {
-	return luax_checktype<CompressedImageData>(L, idx, IMAGE_COMPRESSED_IMAGE_DATA_ID);
+	return luax_checktype<CompressedImageData>(L, idx, CompressedImageData::type);
 }
 
 int w_CompressedImageData_getWidth(lua_State *L)
@@ -106,7 +106,7 @@ static const luaL_Reg w_CompressedImageData_functions[] =
 
 extern "C" int luaopen_compressedimagedata(lua_State *L)
 {
-	return luax_register_type(L, IMAGE_COMPRESSED_IMAGE_DATA_ID, "CompressedImageData", w_Data_functions, w_CompressedImageData_functions, nullptr);
+	return luax_register_type(L, CompressedImageData::type, "CompressedImageData", w_Data_functions, w_CompressedImageData_functions, nullptr);
 }
 
 } // image
diff --git a/src/modules/image/wrap_Image.cpp b/src/modules/image/wrap_Image.cpp
index 96bcb05a1..57928f2a0 100644
--- a/src/modules/image/wrap_Image.cpp
+++ b/src/modules/image/wrap_Image.cpp
@@ -73,7 +73,7 @@ int w_newImageData(lua_State *L)
 			memcpy(t->getData(), bytes, t->getSize());
 		}
 
-		luax_pushtype(L, IMAGE_IMAGE_DATA_ID, t);
+		luax_pushtype(L, ImageData::type, t);
 		t->release();
 		return 1;
 	}
@@ -87,7 +87,7 @@ int w_newImageData(lua_State *L)
 			[&](bool) { data->release(); }
 		);
 
-		luax_pushtype(L, IMAGE_IMAGE_DATA_ID, t);
+		luax_pushtype(L, ImageData::type, t);
 		t->release();
 		return 1;
 	}
@@ -107,7 +107,7 @@ int w_newCompressedData(lua_State *L)
 		[&](bool) { data->release(); }
 	);
 
-	luax_pushtype(L, IMAGE_COMPRESSED_IMAGE_DATA_ID, t);
+	luax_pushtype(L, CompressedImageData::type, t);
 	t->release();
 	return 1;
 }
@@ -151,7 +151,7 @@ extern "C" int luaopen_love_image(lua_State *L)
 	WrappedModule w;
 	w.module = instance;
 	w.name = "image";
-	w.type = MODULE_IMAGE_ID;
+	w.type = &Image::type;
 	w.functions = functions;
 	w.types = types;
 
diff --git a/src/modules/image/wrap_ImageData.cpp b/src/modules/image/wrap_ImageData.cpp
index 7b622bcea..bfbd64bae 100644
--- a/src/modules/image/wrap_ImageData.cpp
+++ b/src/modules/image/wrap_ImageData.cpp
@@ -40,7 +40,7 @@ namespace image
 
 ImageData *luax_checkimagedata(lua_State *L, int idx)
 {
-	return luax_checktype<ImageData>(L, idx, IMAGE_IMAGE_DATA_ID);
+	return luax_checktype<ImageData>(L, idx, ImageData::type);
 }
 
 int w_ImageData_getFormat(lua_State *L)
@@ -282,7 +282,7 @@ int w_ImageData_encode(lua_State *L)
 	love::filesystem::FileData *filedata = nullptr;
 	luax_catchexcept(L, [&](){ filedata = t->encode(format, filename.c_str()); });
 
-	luax_pushtype(L, FILESYSTEM_FILE_DATA_ID, filedata);
+	luax_pushtype(L, love::filesystem::FileData::type, filedata);
 	filedata->release();
 
 	if (hasfilename)
@@ -366,9 +366,9 @@ static const luaL_Reg w_ImageData_functions[] =
 
 extern "C" int luaopen_imagedata(lua_State *L)
 {
-	int ret = luax_register_type(L, IMAGE_IMAGE_DATA_ID, "ImageData", w_Data_functions, w_ImageData_functions, nullptr);
+	int ret = luax_register_type(L, ImageData::type, "ImageData", w_Data_functions, w_ImageData_functions, nullptr);
 
-	luax_gettypemetatable(L, IMAGE_IMAGE_DATA_ID);
+	luax_gettypemetatable(L, ImageData::type);
 
 	// Load and execute ImageData.lua, sending the metatable and the ffi
 	// functions struct pointer as arguments.
diff --git a/src/modules/joystick/Joystick.cpp b/src/modules/joystick/Joystick.cpp
index 513a553cd..7e03b6d25 100644
--- a/src/modules/joystick/Joystick.cpp
+++ b/src/modules/joystick/Joystick.cpp
@@ -29,6 +29,8 @@ namespace love
 namespace joystick
 {
 
+love::Type Joystick::type(&Object::type);
+
 float Joystick::clampval(float x)
 {
 	if (fabsf(x) < 0.01)
diff --git a/src/modules/joystick/Joystick.h b/src/modules/joystick/Joystick.h
index dbad35d7c..1aceb6f2a 100644
--- a/src/modules/joystick/Joystick.h
+++ b/src/modules/joystick/Joystick.h
@@ -38,6 +38,8 @@ class Joystick : public Object
 {
 public:
 
+	static love::Type type;
+
 	// Joystick hat values.
 	enum Hat
 	{
diff --git a/src/modules/joystick/wrap_Joystick.cpp b/src/modules/joystick/wrap_Joystick.cpp
index 32791d1cc..87801f7cc 100644
--- a/src/modules/joystick/wrap_Joystick.cpp
+++ b/src/modules/joystick/wrap_Joystick.cpp
@@ -31,7 +31,7 @@ namespace joystick
 
 Joystick *luax_checkjoystick(lua_State *L, int idx)
 {
-	return luax_checktype<Joystick>(L, idx, JOYSTICK_JOYSTICK_ID);
+	return luax_checktype<Joystick>(L, idx, Joystick::type);
 }
 
 int w_Joystick_isConnected(lua_State *L)
@@ -296,7 +296,7 @@ static const luaL_Reg w_Joystick_functions[] =
 
 extern "C" int luaopen_joystick(lua_State *L)
 {
-	return luax_register_type(L, JOYSTICK_JOYSTICK_ID, "Joystick", w_Joystick_functions, nullptr);
+	return luax_register_type(L, Joystick::type, "Joystick", w_Joystick_functions, nullptr);
 }
 
 } // joystick
diff --git a/src/modules/joystick/wrap_JoystickModule.cpp b/src/modules/joystick/wrap_JoystickModule.cpp
index 0760646b2..d9f3965ac 100644
--- a/src/modules/joystick/wrap_JoystickModule.cpp
+++ b/src/modules/joystick/wrap_JoystickModule.cpp
@@ -40,7 +40,7 @@ int w_getJoysticks(lua_State *L)
 	for (int i = 0; i < stickcount; i++)
 	{
 		Joystick *stick = instance()->getJoystick(i);
-		luax_pushtype(L, JOYSTICK_JOYSTICK_ID, stick);
+		luax_pushtype(L, Joystick::type, stick);
 		lua_rawseti(L, -2, i + 1);
 	}
 
@@ -254,7 +254,7 @@ extern "C" int luaopen_love_joystick(lua_State *L)
 	WrappedModule w;
 	w.module = instance;
 	w.name = "joystick";
-	w.type = MODULE_ID;
+	w.type = &Module::type;
 	w.functions = functions;
 	w.types = types;
 
diff --git a/src/modules/keyboard/wrap_Keyboard.cpp b/src/modules/keyboard/wrap_Keyboard.cpp
index 647905b19..b3770d094 100644
--- a/src/modules/keyboard/wrap_Keyboard.cpp
+++ b/src/modules/keyboard/wrap_Keyboard.cpp
@@ -201,7 +201,7 @@ extern "C" int luaopen_love_keyboard(lua_State *L)
 	WrappedModule w;
 	w.module = instance;
 	w.name = "keyboard";
-	w.type = MODULE_ID;
+	w.type = &Module::type;
 	w.functions = functions;
 	w.types = 0;
 
diff --git a/src/modules/math/BezierCurve.cpp b/src/modules/math/BezierCurve.cpp
index ac29547c2..0fc23b41f 100644
--- a/src/modules/math/BezierCurve.cpp
+++ b/src/modules/math/BezierCurve.cpp
@@ -83,6 +83,8 @@ namespace love
 namespace math
 {
 
+love::Type BezierCurve::type(&Object::type);
+
 BezierCurve::BezierCurve(const vector<Vector> &pts)
 	: controlPoints(pts)
 {
diff --git a/src/modules/math/BezierCurve.h b/src/modules/math/BezierCurve.h
index 76d52d508..aff7c8991 100644
--- a/src/modules/math/BezierCurve.h
+++ b/src/modules/math/BezierCurve.h
@@ -35,6 +35,8 @@ class BezierCurve : public Object
 {
 public:
 
+	static love::Type type;
+
 	/**
 	 * @param controlPoints Control polygon of the curve.
 	 **/
diff --git a/src/modules/math/CompressedData.cpp b/src/modules/math/CompressedData.cpp
index 8628db2b0..399141843 100644
--- a/src/modules/math/CompressedData.cpp
+++ b/src/modules/math/CompressedData.cpp
@@ -26,6 +26,8 @@ namespace love
 namespace math
 {
 
+love::Type CompressedData::type(&Data::type);
+
 CompressedData::CompressedData(Compressor::Format format, char *cdata, size_t compressedsize, size_t rawsize, bool own)
 	: format(format)
 	, data(nullptr)
diff --git a/src/modules/math/CompressedData.h b/src/modules/math/CompressedData.h
index 7e0bcb38b..e48b3b019 100644
--- a/src/modules/math/CompressedData.h
+++ b/src/modules/math/CompressedData.h
@@ -37,6 +37,8 @@ class CompressedData : public love::Data
 {
 public:
 
+	static love::Type type;
+
 	/**
 	 * Constructor just stores already-compressed data in the object.
 	 **/
diff --git a/src/modules/math/RandomGenerator.cpp b/src/modules/math/RandomGenerator.cpp
index 8ffb56110..c06b3bfa4 100644
--- a/src/modules/math/RandomGenerator.cpp
+++ b/src/modules/math/RandomGenerator.cpp
@@ -62,6 +62,8 @@ RandomGenerator::RandomGenerator()
 	setSeed(newseed);
 }
 
+love::Type RandomGenerator::type(&Object::type);
+
 uint64 RandomGenerator::rand()
 {
 	rng_state.b64 ^= (rng_state.b64 >> 12);
diff --git a/src/modules/math/RandomGenerator.h b/src/modules/math/RandomGenerator.h
index c6f93f29c..ec744eb96 100644
--- a/src/modules/math/RandomGenerator.h
+++ b/src/modules/math/RandomGenerator.h
@@ -41,6 +41,8 @@ class RandomGenerator : public Object
 {
 public:
 
+	static love::Type type;
+
 	union Seed
 	{
 		uint64 b64;
diff --git a/src/modules/math/wrap_BezierCurve.cpp b/src/modules/math/wrap_BezierCurve.cpp
index ab6994eb5..5cba80d69 100644
--- a/src/modules/math/wrap_BezierCurve.cpp
+++ b/src/modules/math/wrap_BezierCurve.cpp
@@ -30,7 +30,7 @@ namespace math
 
 BezierCurve *luax_checkbeziercurve(lua_State *L, int idx)
 {
-	return luax_checktype<BezierCurve>(L, idx, MATH_BEZIER_CURVE_ID);
+	return luax_checktype<BezierCurve>(L, idx, BezierCurve::type);
 }
 
 int w_BezierCurve_getDegree(lua_State *L)
@@ -44,7 +44,7 @@ int w_BezierCurve_getDerivative(lua_State *L)
 {
 	BezierCurve *curve = luax_checkbeziercurve(L, 1);
 	BezierCurve *deriv = new BezierCurve(curve->getDerivative());
-	luax_pushtype(L, MATH_BEZIER_CURVE_ID, deriv);
+	luax_pushtype(L, BezierCurve::type, deriv);
 	deriv->release();
 	return 1;
 }
@@ -165,7 +165,7 @@ int w_BezierCurve_getSegment(lua_State *L)
 
 	BezierCurve *segment;
 	luax_catchexcept(L, [&](){ segment = curve->getSegment(t1, t2); });
-	luax_pushtype(L, MATH_BEZIER_CURVE_ID, segment);
+	luax_pushtype(L, BezierCurve::type, segment);
 	segment->release();
 
 	return 1;
@@ -234,7 +234,7 @@ static const luaL_Reg w_BezierCurve_functions[] =
 
 extern "C" int luaopen_beziercurve(lua_State *L)
 {
-	return luax_register_type(L, MATH_BEZIER_CURVE_ID, "BezierCurve", w_BezierCurve_functions, nullptr);
+	return luax_register_type(L, BezierCurve::type, "BezierCurve", w_BezierCurve_functions, nullptr);
 }
 
 } // math
diff --git a/src/modules/math/wrap_CompressedData.cpp b/src/modules/math/wrap_CompressedData.cpp
index 3fa56fbd5..f1b55ce6e 100644
--- a/src/modules/math/wrap_CompressedData.cpp
+++ b/src/modules/math/wrap_CompressedData.cpp
@@ -29,7 +29,7 @@ namespace math
 
 CompressedData *luax_checkcompresseddata(lua_State *L, int idx)
 {
-	return luax_checktype<CompressedData>(L, idx, MATH_COMPRESSED_DATA_ID);
+	return luax_checktype<CompressedData>(L, idx, CompressedData::type);
 }
 
 int w_CompressedData_getFormat(lua_State *L)
@@ -53,7 +53,7 @@ static const luaL_Reg w_CompressedData_functions[] =
 
 extern "C" int luaopen_compresseddata(lua_State *L)
 {
-	return luax_register_type(L, MATH_COMPRESSED_DATA_ID, "CompressedData", w_Data_functions, w_CompressedData_functions, nullptr);
+	return luax_register_type(L, CompressedData::type, "CompressedData", w_Data_functions, w_CompressedData_functions, nullptr);
 }
 
 } // math
diff --git a/src/modules/math/wrap_Math.cpp b/src/modules/math/wrap_Math.cpp
index c53531c96..e5b82c429 100644
--- a/src/modules/math/wrap_Math.cpp
+++ b/src/modules/math/wrap_Math.cpp
@@ -43,7 +43,7 @@ namespace math
 int w__getRandomGenerator(lua_State *L)
 {
 	RandomGenerator *t = Math::instance.getRandomGenerator();
-	luax_pushtype(L, MATH_RANDOM_GENERATOR_ID, t);
+	luax_pushtype(L, RandomGenerator::type, t);
 	return 1;
 }
 
@@ -74,7 +74,7 @@ int w_newRandomGenerator(lua_State *L)
 			return luaL_error(L, "%s", lua_tostring(L, -1));
 	}
 
-	luax_pushtype(L, MATH_RANDOM_GENERATOR_ID, t);
+	luax_pushtype(L, RandomGenerator::type, t);
 	t->release();
 	return 1;
 }
@@ -113,7 +113,7 @@ int w_newBezierCurve(lua_State *L)
 	}
 
 	BezierCurve *curve = Math::instance.newBezierCurve(points);
-	luax_pushtype(L, MATH_BEZIER_CURVE_ID, curve);
+	luax_pushtype(L, BezierCurve::type, curve);
 	curve->release();
 	return 1;
 }
@@ -338,11 +338,11 @@ int w_compress(lua_State *L)
 	}
 	else
 	{
-		Data *rawdata = luax_checktype<Data>(L, 1, DATA_ID);
+		Data *rawdata = luax_checktype<Data>(L, 1, Data::type);
 		luax_catchexcept(L, [&](){ cdata = compress(format, rawdata, level); });
 	}
 
-	luax_pushtype(L, MATH_COMPRESSED_DATA_ID, cdata);
+	luax_pushtype(L, CompressedData::type, cdata);
 	return 1;
 }
 
@@ -351,7 +351,7 @@ int w_decompress(lua_State *L)
 	char *rawbytes = nullptr;
 	size_t rawsize = 0;
 
-	if (luax_istype(L, 1, MATH_COMPRESSED_DATA_ID))
+	if (luax_istype(L, 1, CompressedData::type))
 	{
 		CompressedData *data = luax_checkcompresseddata(L, 1);
 		rawsize = data->getDecompressedSize();
@@ -368,9 +368,9 @@ int w_decompress(lua_State *L)
 		size_t compressedsize = 0;
 		const char *cbytes = nullptr;
 
-		if (luax_istype(L, 1, DATA_ID))
+		if (luax_istype(L, 1, Data::type))
 		{
-			Data *data = luax_checktype<Data>(L, 1, DATA_ID);
+			Data *data = luax_checktype<Data>(L, 1, Data::type);
 			cbytes = (const char *) data->getData();
 			compressedsize = data->getSize();
 		}
@@ -396,9 +396,9 @@ int w_encode(lua_State *L)
 	size_t srclen = 0;
 	const char *src = nullptr;
 
-	if (luax_istype(L, 2, DATA_ID))
+	if (luax_istype(L, 2, Data::type))
 	{
-		Data *data = luax_totype<Data>(L, 2, DATA_ID);
+		Data *data = luax_totype<Data>(L, 2, Data::type);
 		src = (const char *) data->getData();
 		srclen = data->getSize();
 	}
@@ -430,9 +430,9 @@ int w_decode(lua_State *L)
 	size_t srclen = 0;
 	const char *src = nullptr;
 
-	if (luax_istype(L, 2, DATA_ID))
+	if (luax_istype(L, 2, Data::type))
 	{
-		Data *data = luax_totype<Data>(L, 2, DATA_ID);
+		Data *data = luax_totype<Data>(L, 2, Data::type);
 		src = (const char *) data->getData();
 		srclen = data->getSize();
 	}
@@ -468,7 +468,7 @@ int w_hash(lua_State *L)
 	}
 	else
 	{
-		Data *rawdata = luax_checktype<Data>(L, 2, DATA_ID);
+		Data *rawdata = luax_checktype<Data>(L, 2, Data::type);
 		luax_catchexcept(L, [&](){ hash = love::math::hash(function, rawdata); });
 	}
 
@@ -535,7 +535,7 @@ extern "C" int luaopen_love_math(lua_State *L)
 	WrappedModule w;
 	w.module = &Math::instance;
 	w.name = "math";
-	w.type = MODULE_ID;
+	w.type = &Module::type;
 	w.functions = functions;
 	w.types = types;
 
diff --git a/src/modules/math/wrap_RandomGenerator.cpp b/src/modules/math/wrap_RandomGenerator.cpp
index ffd38f18d..d9a36197e 100644
--- a/src/modules/math/wrap_RandomGenerator.cpp
+++ b/src/modules/math/wrap_RandomGenerator.cpp
@@ -63,7 +63,7 @@ RandomGenerator::Seed luax_checkrandomseed(lua_State *L, int idx)
 
 RandomGenerator *luax_checkrandomgenerator(lua_State *L, int idx)
 {
-	return luax_checktype<RandomGenerator>(L, idx, MATH_RANDOM_GENERATOR_ID);
+	return luax_checktype<RandomGenerator>(L, idx, RandomGenerator::type);
 }
 
 int w_RandomGenerator__random(lua_State *L)
@@ -126,7 +126,7 @@ static FFI_RandomGenerator ffifuncs =
 	[](Proxy *p) -> double // random()
 	{
 		// FIXME: We need better type-checking...
-		if (p == nullptr || p->object == nullptr || !typeFlags[p->type][MATH_RANDOM_GENERATOR_ID])
+		if (p == nullptr || p->object == nullptr || p->type == nullptr || !p->type->isa(RandomGenerator::type))
 			return 0.0;
 
 		RandomGenerator *rng = (RandomGenerator *) p->object;
@@ -147,9 +147,9 @@ static const luaL_Reg w_RandomGenerator_functions[] =
 
 extern "C" int luaopen_randomgenerator(lua_State *L)
 {
-	int n = luax_register_type(L, MATH_RANDOM_GENERATOR_ID, "RandomGenerator", w_RandomGenerator_functions, nullptr);
+	int n = luax_register_type(L, RandomGenerator::type, "RandomGenerator", w_RandomGenerator_functions, nullptr);
 
-	luax_gettypemetatable(L, MATH_RANDOM_GENERATOR_ID);
+	luax_gettypemetatable(L, RandomGenerator::type);
 
 	// Load and execute wrap_RandomGenerator.lua, sending the metatable and the
 	// ffi functions struct pointer as arguments.
diff --git a/src/modules/mouse/Cursor.cpp b/src/modules/mouse/Cursor.cpp
index fb8752f16..79cc1b8aa 100644
--- a/src/modules/mouse/Cursor.cpp
+++ b/src/modules/mouse/Cursor.cpp
@@ -25,6 +25,8 @@ namespace love
 namespace mouse
 {
 
+love::Type Cursor::type(&Object::type);
+
 Cursor::~Cursor()
 {
 }
diff --git a/src/modules/mouse/Cursor.h b/src/modules/mouse/Cursor.h
index 6350fc1a2..05b5200bd 100644
--- a/src/modules/mouse/Cursor.h
+++ b/src/modules/mouse/Cursor.h
@@ -35,6 +35,8 @@ class Cursor : public Object
 {
 public:
 
+	static love::Type type;
+
 	// Types of system cursors.
 	enum SystemCursor
 	{
diff --git a/src/modules/mouse/wrap_Cursor.cpp b/src/modules/mouse/wrap_Cursor.cpp
index 6b362178a..3e350d915 100644
--- a/src/modules/mouse/wrap_Cursor.cpp
+++ b/src/modules/mouse/wrap_Cursor.cpp
@@ -28,7 +28,7 @@ namespace mouse
 
 Cursor *luax_checkcursor(lua_State *L, int idx)
 {
-	return luax_checktype<Cursor>(L, idx, MOUSE_CURSOR_ID);
+	return luax_checktype<Cursor>(L, idx, Cursor::type);
 }
 
 int w_Cursor_getType(lua_State *L)
@@ -61,7 +61,7 @@ static const luaL_Reg w_Cursor_functions[] =
 
 extern "C" int luaopen_cursor(lua_State *L)
 {
-	return luax_register_type(L, MOUSE_CURSOR_ID, "Cursor", w_Cursor_functions, nullptr);
+	return luax_register_type(L, Cursor::type, "Cursor", w_Cursor_functions, nullptr);
 }
 
 } // mouse
diff --git a/src/modules/mouse/wrap_Mouse.cpp b/src/modules/mouse/wrap_Mouse.cpp
index 90b8892a6..6fe2695c0 100644
--- a/src/modules/mouse/wrap_Mouse.cpp
+++ b/src/modules/mouse/wrap_Mouse.cpp
@@ -24,6 +24,7 @@
 #include "common/config.h"
 
 #include "sdl/Mouse.h"
+#include "filesystem/File.h"
 
 namespace love
 {
@@ -36,16 +37,16 @@ int w_newCursor(lua_State *L)
 {
 	Cursor *cursor = nullptr;
 
-	if (lua_isstring(L, 1) || luax_istype(L, 1, FILESYSTEM_FILE_ID) || luax_istype(L, 1, FILESYSTEM_FILE_DATA_ID))
+	if (lua_isstring(L, 1) || luax_istype(L, 1, love::filesystem::File::type) || luax_istype(L, 1, love::filesystem::FileData::type))
 		luax_convobj(L, 1, "image", "newImageData");
 
-	love::image::ImageData *data = luax_checktype<love::image::ImageData>(L, 1, IMAGE_IMAGE_DATA_ID);
+	love::image::ImageData *data = luax_checktype<love::image::ImageData>(L, 1, love::image::ImageData::type);
 	int hotx = (int) luaL_optnumber(L, 2, 0);
 	int hoty = (int) luaL_optnumber(L, 3, 0);
 
 	luax_catchexcept(L, [&](){ cursor = instance()->newCursor(data, hotx, hoty); });
 
-	luax_pushtype(L, MOUSE_CURSOR_ID, cursor);
+	luax_pushtype(L, Cursor::type, cursor);
 	cursor->release();
 	return 1;
 }
@@ -61,7 +62,7 @@ int w_getSystemCursor(lua_State *L)
 	Cursor *cursor = 0;
 	luax_catchexcept(L, [&](){ cursor = instance()->getSystemCursor(systemCursor); });
 
-	luax_pushtype(L, MOUSE_CURSOR_ID, cursor);
+	luax_pushtype(L, Cursor::type, cursor);
 	return 1;
 }
 
@@ -84,7 +85,7 @@ int w_getCursor(lua_State *L)
 	Cursor *cursor = instance()->getCursor();
 
 	if (cursor)
-		luax_pushtype(L, MOUSE_CURSOR_ID, cursor);
+		luax_pushtype(L, Cursor::type, cursor);
 	else
 		lua_pushnil(L);
 
@@ -250,7 +251,7 @@ extern "C" int luaopen_love_mouse(lua_State *L)
 	WrappedModule w;
 	w.module = instance;
 	w.name = "mouse";
-	w.type = MODULE_ID;
+	w.type = &Module::type;
 	w.functions = functions;
 	w.types = types;
 
diff --git a/src/modules/physics/Body.cpp b/src/modules/physics/Body.cpp
index 81d1601a3..5cfa99286 100644
--- a/src/modules/physics/Body.cpp
+++ b/src/modules/physics/Body.cpp
@@ -25,6 +25,8 @@ namespace love
 namespace physics
 {
 
+love::Type Body::type(&Object::type);
+
 Body::~Body()
 {
 }
diff --git a/src/modules/physics/Body.h b/src/modules/physics/Body.h
index 77629b7db..7a6d52264 100644
--- a/src/modules/physics/Body.h
+++ b/src/modules/physics/Body.h
@@ -34,6 +34,8 @@ class Body : public Object
 {
 public:
 
+	static love::Type type;
+
 	enum Type
 	{
 		BODY_INVALID,
diff --git a/src/modules/physics/Joint.cpp b/src/modules/physics/Joint.cpp
index f85292bef..a5f131870 100644
--- a/src/modules/physics/Joint.cpp
+++ b/src/modules/physics/Joint.cpp
@@ -25,6 +25,8 @@ namespace love
 namespace physics
 {
 
+love::Type Joint::type(&Object::type);
+
 Joint::~Joint()
 {
 }
diff --git a/src/modules/physics/Joint.h b/src/modules/physics/Joint.h
index 670f966bf..a60979e0b 100644
--- a/src/modules/physics/Joint.h
+++ b/src/modules/physics/Joint.h
@@ -34,6 +34,8 @@ class Joint : public Object
 {
 public:
 
+	static love::Type type;
+
 	enum Type
 	{
 		JOINT_INVALID,
diff --git a/src/modules/physics/Shape.cpp b/src/modules/physics/Shape.cpp
index d30d157e4..00e06f064 100644
--- a/src/modules/physics/Shape.cpp
+++ b/src/modules/physics/Shape.cpp
@@ -25,6 +25,8 @@ namespace love
 namespace physics
 {
 
+love::Type Shape::type(&Object::type);
+
 Shape::~Shape()
 {
 }
diff --git a/src/modules/physics/Shape.h b/src/modules/physics/Shape.h
index 267cf9b89..c2ace2dfb 100644
--- a/src/modules/physics/Shape.h
+++ b/src/modules/physics/Shape.h
@@ -34,6 +34,8 @@ class Shape : public Object
 {
 public:
 
+	static love::Type type;
+
 	enum Type
 	{
 		SHAPE_INVALID,
diff --git a/src/modules/physics/box2d/Body.cpp b/src/modules/physics/box2d/Body.cpp
index c9dad71c1..3f2d23557 100644
--- a/src/modules/physics/box2d/Body.cpp
+++ b/src/modules/physics/box2d/Body.cpp
@@ -435,7 +435,7 @@ int Body::getFixtureList(lua_State *L) const
 		Fixture *fixture = (Fixture *)Memoizer::find(f);
 		if (!fixture)
 			throw love::Exception("A fixture has escaped Memoizer!");
-		luax_pushtype(L, PHYSICS_FIXTURE_ID, fixture);
+		luax_pushtype(L, Fixture::type, fixture);
 		lua_rawseti(L, -2, i);
 		i++;
 	}
@@ -483,7 +483,7 @@ int Body::getContactList(lua_State *L) const
 		else
 			contact->retain();
 
-		luax_pushtype(L, PHYSICS_CONTACT_ID, contact);
+		luax_pushtype(L, Contact::type, contact);
 		contact->release();
 		lua_rawseti(L, -2, i);
 		i++;
diff --git a/src/modules/physics/box2d/ChainShape.cpp b/src/modules/physics/box2d/ChainShape.cpp
index 1b77d0cc8..906e76294 100644
--- a/src/modules/physics/box2d/ChainShape.cpp
+++ b/src/modules/physics/box2d/ChainShape.cpp
@@ -34,6 +34,8 @@ namespace physics
 namespace box2d
 {
 
+love::Type ChainShape::type(&Shape::type);
+
 ChainShape::ChainShape(b2ChainShape *c, bool loop, bool own)
 	: Shape(c, own), loop(loop)
 {
diff --git a/src/modules/physics/box2d/ChainShape.h b/src/modules/physics/box2d/ChainShape.h
index 8b7a18f2f..621c93948 100644
--- a/src/modules/physics/box2d/ChainShape.h
+++ b/src/modules/physics/box2d/ChainShape.h
@@ -39,6 +39,8 @@ class ChainShape : public Shape
 {
 public:
 
+	static love::Type type;
+
 	/**
 	 * Create a new ChainShape from a Box2D chain shape.
 	 * @param c The chain shape.
diff --git a/src/modules/physics/box2d/CircleShape.cpp b/src/modules/physics/box2d/CircleShape.cpp
index 0914f976b..36291271c 100644
--- a/src/modules/physics/box2d/CircleShape.cpp
+++ b/src/modules/physics/box2d/CircleShape.cpp
@@ -34,6 +34,8 @@ namespace physics
 namespace box2d
 {
 
+love::Type CircleShape::type(&Shape::type);
+
 CircleShape::CircleShape(b2CircleShape *c, bool own)
 	: Shape(c, own)
 {
diff --git a/src/modules/physics/box2d/CircleShape.h b/src/modules/physics/box2d/CircleShape.h
index ee45da441..87063c016 100644
--- a/src/modules/physics/box2d/CircleShape.h
+++ b/src/modules/physics/box2d/CircleShape.h
@@ -44,6 +44,8 @@ class CircleShape : public Shape
 {
 public:
 
+	static love::Type type;
+
 	/**
 	 * Create a new CircleShape from the a Box2D CircleShape definition.
 	 * @param c The CircleShape definition.
diff --git a/src/modules/physics/box2d/Contact.cpp b/src/modules/physics/box2d/Contact.cpp
index 82eaafebe..db18d18fb 100644
--- a/src/modules/physics/box2d/Contact.cpp
+++ b/src/modules/physics/box2d/Contact.cpp
@@ -31,6 +31,8 @@ namespace physics
 namespace box2d
 {
 
+love::Type Contact::type(&Object::type);
+
 Contact::Contact(b2Contact *contact)
 	: contact(contact)
 {
diff --git a/src/modules/physics/box2d/Contact.h b/src/modules/physics/box2d/Contact.h
index 99f953fc2..ac330028e 100644
--- a/src/modules/physics/box2d/Contact.h
+++ b/src/modules/physics/box2d/Contact.h
@@ -49,6 +49,8 @@ public:
 	friend class World;
 	friend class World::ContactCallback;
 
+	static love::Type type;
+
 	/**
 	 * Creates a new Contact by copying a Box2D contact
 	 * point. It does not store the pointer, but copy the
diff --git a/src/modules/physics/box2d/EdgeShape.cpp b/src/modules/physics/box2d/EdgeShape.cpp
index 8189b1318..40e0baf55 100644
--- a/src/modules/physics/box2d/EdgeShape.cpp
+++ b/src/modules/physics/box2d/EdgeShape.cpp
@@ -34,6 +34,8 @@ namespace physics
 namespace box2d
 {
 
+love::Type EdgeShape::type(&Shape::type);
+
 EdgeShape::EdgeShape(b2EdgeShape *e, bool own)
 	: Shape(e, own)
 {
diff --git a/src/modules/physics/box2d/EdgeShape.h b/src/modules/physics/box2d/EdgeShape.h
index 3e5184a22..a60ac0ef8 100644
--- a/src/modules/physics/box2d/EdgeShape.h
+++ b/src/modules/physics/box2d/EdgeShape.h
@@ -39,6 +39,8 @@ class EdgeShape : public Shape
 {
 public:
 
+	static love::Type type;
+
 	/**
 	 * Create a new EdgeShape from a Box2D edge shape.
 	 * @param e The edge shape.
diff --git a/src/modules/physics/box2d/Fixture.cpp b/src/modules/physics/box2d/Fixture.cpp
index 7f0b31e28..c7c3f0821 100644
--- a/src/modules/physics/box2d/Fixture.cpp
+++ b/src/modules/physics/box2d/Fixture.cpp
@@ -37,6 +37,8 @@ namespace physics
 namespace box2d
 {
 
+love::Type Fixture::type(&Object::type);
+
 Fixture::Fixture(Body *body, Shape *shape, float density)
 	: body(body)
 	, fixture(nullptr)
diff --git a/src/modules/physics/box2d/Fixture.h b/src/modules/physics/box2d/Fixture.h
index 278befa00..cbde4f3c1 100644
--- a/src/modules/physics/box2d/Fixture.h
+++ b/src/modules/physics/box2d/Fixture.h
@@ -61,6 +61,8 @@ class Fixture : public Object
 public:
 	friend class Physics;
 
+	static love::Type type;
+
 	/**
 	 * Creates a Fixture.
 	 **/
diff --git a/src/modules/physics/box2d/FrictionJoint.cpp b/src/modules/physics/box2d/FrictionJoint.cpp
index 7d3dce3fa..4cec8aa02 100644
--- a/src/modules/physics/box2d/FrictionJoint.cpp
+++ b/src/modules/physics/box2d/FrictionJoint.cpp
@@ -34,6 +34,8 @@ namespace physics
 namespace box2d
 {
 
+love::Type FrictionJoint::type(&Joint::type);
+
 FrictionJoint::FrictionJoint(Body *body1, Body *body2, float xA, float yA, float xB, float yB, bool collideConnected)
 	: Joint(body1, body2)
 	, joint(NULL)
diff --git a/src/modules/physics/box2d/FrictionJoint.h b/src/modules/physics/box2d/FrictionJoint.h
index 6814c6fac..5c3dbe3f7 100644
--- a/src/modules/physics/box2d/FrictionJoint.h
+++ b/src/modules/physics/box2d/FrictionJoint.h
@@ -38,6 +38,8 @@ class FrictionJoint : public Joint
 {
 public:
 
+	static love::Type type;
+
 	/**
 	 * Creates a new FrictionJoint connecting body1 and body2.
 	 **/
diff --git a/src/modules/physics/box2d/GearJoint.cpp b/src/modules/physics/box2d/GearJoint.cpp
index 8f67e0f94..1b1f8702c 100644
--- a/src/modules/physics/box2d/GearJoint.cpp
+++ b/src/modules/physics/box2d/GearJoint.cpp
@@ -32,6 +32,8 @@ namespace physics
 namespace box2d
 {
 
+love::Type GearJoint::type(&Joint::type);
+
 GearJoint::GearJoint(Joint *joint1, Joint *joint2, float ratio, bool collideConnected)
 	: Joint(joint1->body2, joint2->body2)
 	, joint(NULL)
diff --git a/src/modules/physics/box2d/GearJoint.h b/src/modules/physics/box2d/GearJoint.h
index 9f2a5ef13..4d3812c19 100644
--- a/src/modules/physics/box2d/GearJoint.h
+++ b/src/modules/physics/box2d/GearJoint.h
@@ -47,6 +47,8 @@ class GearJoint : public Joint
 {
 public:
 
+	static love::Type type;
+
 	/**
 	 * Creates a GearJoint connecting joint1 to joint2.
 	 **/
diff --git a/src/modules/physics/box2d/MotorJoint.cpp b/src/modules/physics/box2d/MotorJoint.cpp
index 3902fe38b..3eca55e57 100644
--- a/src/modules/physics/box2d/MotorJoint.cpp
+++ b/src/modules/physics/box2d/MotorJoint.cpp
@@ -32,6 +32,8 @@ namespace physics
 namespace box2d
 {
 
+love::Type MotorJoint::type(&Joint::type);
+
 MotorJoint::MotorJoint(Body *body1, Body *body2)
 	: Joint(body1, body2)
 	, joint(NULL)
diff --git a/src/modules/physics/box2d/MotorJoint.h b/src/modules/physics/box2d/MotorJoint.h
index 69d9432ee..947a6d4be 100644
--- a/src/modules/physics/box2d/MotorJoint.h
+++ b/src/modules/physics/box2d/MotorJoint.h
@@ -40,6 +40,8 @@ class MotorJoint : public Joint
 {
 public:
 
+	static love::Type type;
+
 	MotorJoint(Body *body1, Body* body2);
 	MotorJoint(Body *body1, Body* body2, float correctionFactor, bool collideConnected);
 	virtual ~MotorJoint();
diff --git a/src/modules/physics/box2d/MouseJoint.cpp b/src/modules/physics/box2d/MouseJoint.cpp
index 96768e870..216609af5 100644
--- a/src/modules/physics/box2d/MouseJoint.cpp
+++ b/src/modules/physics/box2d/MouseJoint.cpp
@@ -32,6 +32,8 @@ namespace physics
 namespace box2d
 {
 
+love::Type MouseJoint::type(&Joint::type);
+
 MouseJoint::MouseJoint(Body *body1, float x, float y)
 	: Joint(body1)
 	, joint(NULL)
diff --git a/src/modules/physics/box2d/MouseJoint.h b/src/modules/physics/box2d/MouseJoint.h
index bf365e8d2..ea6dd33b6 100644
--- a/src/modules/physics/box2d/MouseJoint.h
+++ b/src/modules/physics/box2d/MouseJoint.h
@@ -43,6 +43,8 @@ class MouseJoint : public Joint
 {
 public:
 
+	static love::Type type;
+
 	/**
 	 * Creates a MouseJoint which connects body1 to the target point.
 	 **/
diff --git a/src/modules/physics/box2d/Physics.cpp b/src/modules/physics/box2d/Physics.cpp
index e55be0c5e..7115ac6a5 100644
--- a/src/modules/physics/box2d/Physics.cpp
+++ b/src/modules/physics/box2d/Physics.cpp
@@ -146,7 +146,7 @@ int Physics::newPolygonShape(lua_State *L)
 	}
 
 	PolygonShape *p = new PolygonShape(s);
-	luax_pushtype(L, PHYSICS_POLYGON_SHAPE_ID, p);
+	luax_pushtype(L, PolygonShape::type, p);
 	p->release();
 	return 1;
 }
@@ -208,7 +208,7 @@ int Physics::newChainShape(lua_State *L)
 	delete[] vecs;
 
 	ChainShape *c = new ChainShape(s);
-	luax_pushtype(L, PHYSICS_CHAIN_SHAPE_ID, c);
+	luax_pushtype(L, ChainShape::type, c);
 	c->release();
 	return 1;
 }
@@ -296,8 +296,8 @@ Fixture *Physics::newFixture(Body *body, Shape *shape, float density)
 
 int Physics::getDistance(lua_State *L)
 {
-	Fixture *fixtureA = luax_checktype<Fixture>(L, 1, PHYSICS_FIXTURE_ID);
-	Fixture *fixtureB = luax_checktype<Fixture>(L, 2, PHYSICS_FIXTURE_ID);
+	Fixture *fixtureA = luax_checktype<Fixture>(L, 1, Fixture::type);
+	Fixture *fixtureB = luax_checktype<Fixture>(L, 2, Fixture::type);
 	b2DistanceProxy pA, pB;
 	b2DistanceInput i;
 	b2DistanceOutput o;
diff --git a/src/modules/physics/box2d/PolygonShape.cpp b/src/modules/physics/box2d/PolygonShape.cpp
index e37811781..c5d715a64 100644
--- a/src/modules/physics/box2d/PolygonShape.cpp
+++ b/src/modules/physics/box2d/PolygonShape.cpp
@@ -34,6 +34,8 @@ namespace physics
 namespace box2d
 {
 
+love::Type PolygonShape::type(&Shape::type);
+
 PolygonShape::PolygonShape(b2PolygonShape *p, bool own)
 	: Shape(p, own)
 {
diff --git a/src/modules/physics/box2d/PolygonShape.h b/src/modules/physics/box2d/PolygonShape.h
index 126747daf..892b40a04 100644
--- a/src/modules/physics/box2d/PolygonShape.h
+++ b/src/modules/physics/box2d/PolygonShape.h
@@ -42,6 +42,8 @@ class PolygonShape : public Shape
 {
 public:
 
+	static love::Type type;
+
 	/**
 	 * Create a new PolygonShape from a Box2D polygon definition.
 	 * @param p The polygon definition.
diff --git a/src/modules/physics/box2d/PrismaticJoint.cpp b/src/modules/physics/box2d/PrismaticJoint.cpp
index 8ee1e1084..54c43c8e2 100644
--- a/src/modules/physics/box2d/PrismaticJoint.cpp
+++ b/src/modules/physics/box2d/PrismaticJoint.cpp
@@ -32,6 +32,8 @@ namespace physics
 namespace box2d
 {
 
+love::Type PrismaticJoint::type(&Joint::type);
+
 PrismaticJoint::PrismaticJoint(Body *body1, Body *body2, float xA, float yA, float xB, float yB, float ax, float ay, bool collideConnected)
 	: Joint(body1, body2)
 	, joint(NULL)
diff --git a/src/modules/physics/box2d/PrismaticJoint.h b/src/modules/physics/box2d/PrismaticJoint.h
index dba1d4e70..6d93c9449 100644
--- a/src/modules/physics/box2d/PrismaticJoint.h
+++ b/src/modules/physics/box2d/PrismaticJoint.h
@@ -39,6 +39,8 @@ class PrismaticJoint : public Joint
 {
 public:
 
+	static love::Type type;
+
 	/**
 	 * Creates a new PrismaticJoint connecting body1 and body2.
 	 **/
diff --git a/src/modules/physics/box2d/PulleyJoint.cpp b/src/modules/physics/box2d/PulleyJoint.cpp
index 224e37c9f..699a41331 100644
--- a/src/modules/physics/box2d/PulleyJoint.cpp
+++ b/src/modules/physics/box2d/PulleyJoint.cpp
@@ -32,6 +32,8 @@ namespace physics
 namespace box2d
 {
 
+love::Type PulleyJoint::type(&Joint::type);
+
 PulleyJoint::PulleyJoint(Body *bodyA, Body *bodyB, b2Vec2 groundAnchorA, b2Vec2 groundAnchorB, b2Vec2 anchorA, b2Vec2 anchorB, float ratio, bool collideConnected)
 	: Joint(bodyA, bodyB)
 	, joint(NULL)
diff --git a/src/modules/physics/box2d/PulleyJoint.h b/src/modules/physics/box2d/PulleyJoint.h
index a233206d6..a4d61806a 100644
--- a/src/modules/physics/box2d/PulleyJoint.h
+++ b/src/modules/physics/box2d/PulleyJoint.h
@@ -41,6 +41,8 @@ class PulleyJoint : public Joint
 {
 public:
 
+	static love::Type type;
+
 	/**
 	 * Creates a PulleyJoint connecting bodyA to bodyB.
 	 **/
diff --git a/src/modules/physics/box2d/RevoluteJoint.cpp b/src/modules/physics/box2d/RevoluteJoint.cpp
index ba1e1e87b..8af609791 100644
--- a/src/modules/physics/box2d/RevoluteJoint.cpp
+++ b/src/modules/physics/box2d/RevoluteJoint.cpp
@@ -34,6 +34,8 @@ namespace physics
 namespace box2d
 {
 
+love::Type RevoluteJoint::type(&Joint::type);
+
 RevoluteJoint::RevoluteJoint(Body *body1, Body *body2, float xA, float yA, float xB, float yB, bool collideConnected)
 	: Joint(body1, body2)
 	, joint(NULL)
diff --git a/src/modules/physics/box2d/RevoluteJoint.h b/src/modules/physics/box2d/RevoluteJoint.h
index f54026be5..3019ff9ef 100644
--- a/src/modules/physics/box2d/RevoluteJoint.h
+++ b/src/modules/physics/box2d/RevoluteJoint.h
@@ -39,6 +39,8 @@ class RevoluteJoint : public Joint
 {
 public:
 
+	static love::Type type;
+
 	/**
 	 * Creates a new RevoluteJoint connecting body1 and body2.
 	 **/
diff --git a/src/modules/physics/box2d/RopeJoint.cpp b/src/modules/physics/box2d/RopeJoint.cpp
index 8db662a09..2e628cf17 100644
--- a/src/modules/physics/box2d/RopeJoint.cpp
+++ b/src/modules/physics/box2d/RopeJoint.cpp
@@ -32,6 +32,8 @@ namespace physics
 namespace box2d
 {
 
+love::Type RopeJoint::type(&Joint::type);
+
 RopeJoint::RopeJoint(Body *body1, Body *body2, float x1, float y1, float x2, float y2, float maxLength, bool collideConnected)
 	: Joint(body1, body2)
 	, joint(NULL)
diff --git a/src/modules/physics/box2d/RopeJoint.h b/src/modules/physics/box2d/RopeJoint.h
index 56d00bb20..80bb7ac7f 100644
--- a/src/modules/physics/box2d/RopeJoint.h
+++ b/src/modules/physics/box2d/RopeJoint.h
@@ -39,6 +39,8 @@ class RopeJoint : public Joint
 {
 public:
 
+	static love::Type type;
+
 	/**
 	 * Creates a RopeJoint connecting body1 to body2.
 	 **/
diff --git a/src/modules/physics/box2d/WeldJoint.cpp b/src/modules/physics/box2d/WeldJoint.cpp
index bc21a28f3..f53ec7c8e 100644
--- a/src/modules/physics/box2d/WeldJoint.cpp
+++ b/src/modules/physics/box2d/WeldJoint.cpp
@@ -34,6 +34,8 @@ namespace physics
 namespace box2d
 {
 
+love::Type WeldJoint::type(&Joint::type);
+
 WeldJoint::WeldJoint(Body *body1, Body *body2, float xA, float yA, float xB, float yB, bool collideConnected)
 	: Joint(body1, body2)
 	, joint(NULL)
diff --git a/src/modules/physics/box2d/WeldJoint.h b/src/modules/physics/box2d/WeldJoint.h
index c3fa0a3d6..bb04faa9f 100644
--- a/src/modules/physics/box2d/WeldJoint.h
+++ b/src/modules/physics/box2d/WeldJoint.h
@@ -38,6 +38,8 @@ class WeldJoint : public Joint
 {
 public:
 
+	static love::Type type;
+
 	/**
 	 * Creates a new WeldJoint connecting body1 and body2.
 	 **/
diff --git a/src/modules/physics/box2d/WheelJoint.cpp b/src/modules/physics/box2d/WheelJoint.cpp
index 2670878cd..2f1d9fcae 100644
--- a/src/modules/physics/box2d/WheelJoint.cpp
+++ b/src/modules/physics/box2d/WheelJoint.cpp
@@ -32,6 +32,8 @@ namespace physics
 namespace box2d
 {
 
+love::Type WheelJoint::type(&Joint::type);
+
 WheelJoint::WheelJoint(Body *body1, Body *body2, float xA, float yA, float xB, float yB, float ax, float ay, bool collideConnected)
 	: Joint(body1, body2)
 	, joint(NULL)
diff --git a/src/modules/physics/box2d/WheelJoint.h b/src/modules/physics/box2d/WheelJoint.h
index b08d28104..5aaac8ee1 100644
--- a/src/modules/physics/box2d/WheelJoint.h
+++ b/src/modules/physics/box2d/WheelJoint.h
@@ -40,6 +40,8 @@ class WheelJoint : public Joint
 {
 public:
 
+	static love::Type type;
+
 	/**
 	 * Creates a new WheelJoint connecting body1 and body2.
 	 **/
diff --git a/src/modules/physics/box2d/World.cpp b/src/modules/physics/box2d/World.cpp
index 701ae21be..c51ea3d09 100644
--- a/src/modules/physics/box2d/World.cpp
+++ b/src/modules/physics/box2d/World.cpp
@@ -34,6 +34,8 @@ namespace physics
 namespace box2d
 {
 
+love::Type World::type(&Object::type);
+
 World::ContactCallback::ContactCallback()
 	: ref(nullptr)
 	, L(nullptr)
@@ -57,7 +59,7 @@ void World::ContactCallback::process(b2Contact *contact, const b2ContactImpulse
 		{
 			Fixture *a = (Fixture *)Memoizer::find(contact->GetFixtureA());
 			if (a != nullptr)
-				luax_pushtype(L, PHYSICS_FIXTURE_ID, a);
+				luax_pushtype(L, Fixture::type, a);
 			else
 				throw love::Exception("A fixture has escaped Memoizer!");
 		}
@@ -66,7 +68,7 @@ void World::ContactCallback::process(b2Contact *contact, const b2ContactImpulse
 		{
 			Fixture *b = (Fixture *)Memoizer::find(contact->GetFixtureB());
 			if (b != nullptr)
-				luax_pushtype(L, PHYSICS_FIXTURE_ID, b);
+				luax_pushtype(L, Fixture::type, b);
 			else
 				throw love::Exception("A fixture has escaped Memoizer!");
 		}
@@ -77,7 +79,7 @@ void World::ContactCallback::process(b2Contact *contact, const b2ContactImpulse
 		else
 			cobj->retain();
 
-		luax_pushtype(L, PHYSICS_CONTACT_ID, cobj);
+		luax_pushtype(L, Contact::type, cobj);
 		cobj->release();
 
 		int args = 3;
@@ -128,8 +130,8 @@ bool World::ContactFilter::process(Fixture *a, Fixture *b)
 	if (ref != nullptr && L != nullptr)
 	{
 		ref->push(L);
-		luax_pushtype(L, PHYSICS_FIXTURE_ID, a);
-		luax_pushtype(L, PHYSICS_FIXTURE_ID, b);
+		luax_pushtype(L, Fixture::type, a);
+		luax_pushtype(L, Fixture::type, b);
 		lua_call(L, 2, 1);
 		return luax_toboolean(L, -1);
 	}
@@ -155,7 +157,7 @@ bool World::QueryCallback::ReportFixture(b2Fixture *fixture)
 		Fixture *f = (Fixture *)Memoizer::find(fixture);
 		if (!f)
 			throw love::Exception("A fixture has escaped Memoizer!");
-		luax_pushtype(L, PHYSICS_FIXTURE_ID, f);
+		luax_pushtype(L, Fixture::type, f);
 		lua_call(L, 1, 1);
 		bool cont = luax_toboolean(L, -1);
 		lua_pop(L, 1);
@@ -184,7 +186,7 @@ float32 World::RayCastCallback::ReportFixture(b2Fixture *fixture, const b2Vec2 &
 		Fixture *f = (Fixture *)Memoizer::find(fixture);
 		if (!f)
 			throw love::Exception("A fixture has escaped Memoizer!");
-		luax_pushtype(L, PHYSICS_FIXTURE_ID, f);
+		luax_pushtype(L, Fixture::type, f);
 		b2Vec2 scaledPoint = Physics::scaleUp(point);
 		lua_pushnumber(L, scaledPoint.x);
 		lua_pushnumber(L, scaledPoint.y);
@@ -473,7 +475,7 @@ int World::getBodyList(lua_State *L) const
 		Body *body = (Body *)Memoizer::find(b);
 		if (!body)
 			throw love::Exception("A body has escaped Memoizer!");
-		luax_pushtype(L, PHYSICS_BODY_ID, body);
+		luax_pushtype(L, Body::type, body);
 		lua_rawseti(L, -2, i);
 		i++;
 	}
@@ -491,7 +493,7 @@ int World::getJointList(lua_State *L) const
 		if (!j) break;
 		Joint *joint = (Joint *)Memoizer::find(j);
 		if (!joint) throw love::Exception("A joint has escaped Memoizer!");
-		luax_pushtype(L, PHYSICS_JOINT_ID, joint);
+		luax_pushtype(L, Joint::type, joint);
 		lua_rawseti(L, -2, i);
 		i++;
 	}
@@ -512,7 +514,7 @@ int World::getContactList(lua_State *L) const
 			contact = new Contact(c);
 		else
 			contact->retain();
-		luax_pushtype(L, PHYSICS_CONTACT_ID, contact);
+		luax_pushtype(L, Contact::type, contact);
 		contact->release();
 		lua_rawseti(L, -2, i);
 		i++;
diff --git a/src/modules/physics/box2d/World.h b/src/modules/physics/box2d/World.h
index 30b3c3940..8df1b890c 100644
--- a/src/modules/physics/box2d/World.h
+++ b/src/modules/physics/box2d/World.h
@@ -66,6 +66,8 @@ public:
 	friend class Body;
 	friend class Fixture;
 
+	static love::Type type;
+
 	class ContactCallback
 	{
 	public:
diff --git a/src/modules/physics/box2d/wrap_Body.cpp b/src/modules/physics/box2d/wrap_Body.cpp
index 3936b41e0..13c0059b7 100644
--- a/src/modules/physics/box2d/wrap_Body.cpp
+++ b/src/modules/physics/box2d/wrap_Body.cpp
@@ -30,7 +30,7 @@ namespace box2d
 
 Body *luax_checkbody(lua_State *L, int idx)
 {
-	Body *b = luax_checktype<Body>(L, idx, PHYSICS_BODY_ID);
+	Body *b = luax_checktype<Body>(L, idx, Body::type);
 	if (b->body == 0)
 		luaL_error(L, "Attempt to use destroyed body.");
 	return b;
@@ -526,7 +526,7 @@ int w_Body_getWorld(lua_State *L)
 {
 	Body *t = luax_checkbody(L, 1);
 	World *world = t->getWorld();
-	luax_pushtype(L, PHYSICS_WORLD_ID, world);
+	luax_pushtype(L, World::type, world);
 	return 1;
 }
 
@@ -566,7 +566,7 @@ int w_Body_destroy(lua_State *L)
 
 int w_Body_isDestroyed(lua_State *L)
 {
-	Body *b = luax_checktype<Body>(L, 1, PHYSICS_BODY_ID);
+	Body *b = luax_checktype<Body>(L, 1, Body::type);
 	luax_pushboolean(L, b->body == nullptr);
 	return 1;
 }
@@ -650,7 +650,7 @@ static const luaL_Reg w_Body_functions[] =
 
 extern "C" int luaopen_body(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_BODY_ID, "Body", w_Body_functions, nullptr);
+	return luax_register_type(L, Body::type, "Body", w_Body_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/physics/box2d/wrap_ChainShape.cpp b/src/modules/physics/box2d/wrap_ChainShape.cpp
index a68e66772..c0fbbccde 100644
--- a/src/modules/physics/box2d/wrap_ChainShape.cpp
+++ b/src/modules/physics/box2d/wrap_ChainShape.cpp
@@ -31,7 +31,7 @@ namespace box2d
 
 ChainShape *luax_checkchainshape(lua_State *L, int idx)
 {
-	return luax_checktype<ChainShape>(L, idx, PHYSICS_CHAIN_SHAPE_ID);
+	return luax_checktype<ChainShape>(L, idx, ChainShape::type);
 }
 
 int w_ChainShape_setNextVertex(lua_State *L)
@@ -68,7 +68,7 @@ int w_ChainShape_getChildEdge(lua_State *L)
 	int index = (int) luaL_checknumber(L, 2) - 1; // Convert from 1-based index
 	EdgeShape *e = 0;
 	luax_catchexcept(L, [&](){ e = c->getChildEdge(index); });
-	luax_pushtype(L, PHYSICS_EDGE_SHAPE_ID, e);
+	luax_pushtype(L, EdgeShape::type, e);
 	e->release();
 	return 1;
 }
@@ -149,7 +149,7 @@ static const luaL_Reg w_ChainShape_functions[] =
 
 extern "C" int luaopen_chainshape(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_CHAIN_SHAPE_ID, "ChainShape", w_Shape_functions, w_ChainShape_functions, nullptr);
+	return luax_register_type(L, ChainShape::type, "ChainShape", w_Shape_functions, w_ChainShape_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/physics/box2d/wrap_CircleShape.cpp b/src/modules/physics/box2d/wrap_CircleShape.cpp
index a2d27beaa..90740c065 100644
--- a/src/modules/physics/box2d/wrap_CircleShape.cpp
+++ b/src/modules/physics/box2d/wrap_CircleShape.cpp
@@ -29,7 +29,7 @@ namespace box2d
 
 CircleShape *luax_checkcircleshape(lua_State *L, int idx)
 {
-	return luax_checktype<CircleShape>(L, idx, PHYSICS_CIRCLE_SHAPE_ID);
+	return luax_checktype<CircleShape>(L, idx, CircleShape::type);
 }
 
 int w_CircleShape_getRadius(lua_State *L)
@@ -75,7 +75,7 @@ static const luaL_Reg w_CircleShape_functions[] =
 
 extern "C" int luaopen_circleshape(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_CIRCLE_SHAPE_ID, "CircleShape", w_Shape_functions, w_CircleShape_functions, nullptr);
+	return luax_register_type(L, CircleShape::type, "CircleShape", w_Shape_functions, w_CircleShape_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/physics/box2d/wrap_Contact.cpp b/src/modules/physics/box2d/wrap_Contact.cpp
index aa2d80cd1..a4cc2f1dc 100644
--- a/src/modules/physics/box2d/wrap_Contact.cpp
+++ b/src/modules/physics/box2d/wrap_Contact.cpp
@@ -30,7 +30,7 @@ namespace box2d
 
 Contact *luax_checkcontact(lua_State *L, int idx)
 {
-	Contact *c = luax_checktype<Contact>(L, idx, PHYSICS_CONTACT_ID);
+	Contact *c = luax_checktype<Contact>(L, idx, Contact::type);
 	if (!c->isValid())
 		luaL_error(L, "Attempt to use destroyed contact.");
 	return c;
@@ -146,14 +146,14 @@ int w_Contact_getFixtures(lua_State *L)
 	Fixture *b = nullptr;
 	luax_catchexcept(L, [&](){ t->getFixtures(a, b); });
 
-	luax_pushtype(L, PHYSICS_FIXTURE_ID, a);
-	luax_pushtype(L, PHYSICS_FIXTURE_ID, b);
+	luax_pushtype(L, Fixture::type, a);
+	luax_pushtype(L, Fixture::type, b);
 	return 2;
 }
 
 int w_Contact_isDestroyed(lua_State *L)
 {
-	Contact *c = luax_checktype<Contact>(L, 1, PHYSICS_CONTACT_ID);
+	Contact *c = luax_checktype<Contact>(L, 1, Contact::type);
 	luax_pushboolean(L, !c->isValid());
 	return 1;
 }
@@ -181,7 +181,7 @@ static const luaL_Reg w_Contact_functions[] =
 
 extern "C" int luaopen_contact(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_CONTACT_ID, "Contact", w_Contact_functions, nullptr);
+	return luax_register_type(L, Contact::type, "Contact", w_Contact_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/physics/box2d/wrap_DistanceJoint.cpp b/src/modules/physics/box2d/wrap_DistanceJoint.cpp
index 8cd7526de..bd9c0a3ba 100644
--- a/src/modules/physics/box2d/wrap_DistanceJoint.cpp
+++ b/src/modules/physics/box2d/wrap_DistanceJoint.cpp
@@ -29,7 +29,7 @@ namespace box2d
 
 DistanceJoint *luax_checkdistancejoint(lua_State *L, int idx)
 {
-	DistanceJoint *j = luax_checktype<DistanceJoint>(L, idx, PHYSICS_DISTANCE_JOINT_ID);
+	DistanceJoint *j = luax_checktype<DistanceJoint>(L, idx, DistanceJoint::type);
 	if (!j->isValid())
 		luaL_error(L, "Attempt to use destroyed joint.");
 	return j;
@@ -93,7 +93,7 @@ static const luaL_Reg w_DistanceJoint_functions[] =
 
 extern "C" int luaopen_distancejoint(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_DISTANCE_JOINT_ID, "DistanceJoint", w_Joint_functions, w_DistanceJoint_functions, nullptr);
+	return luax_register_type(L, DistanceJoint::type, "DistanceJoint", w_Joint_functions, w_DistanceJoint_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/physics/box2d/wrap_EdgeShape.cpp b/src/modules/physics/box2d/wrap_EdgeShape.cpp
index 53c8805ce..9ae2ccb3c 100644
--- a/src/modules/physics/box2d/wrap_EdgeShape.cpp
+++ b/src/modules/physics/box2d/wrap_EdgeShape.cpp
@@ -29,7 +29,7 @@ namespace box2d
 
 EdgeShape *luax_checkedgeshape(lua_State *L, int idx)
 {
-	return luax_checktype<EdgeShape>(L, idx, PHYSICS_EDGE_SHAPE_ID);
+	return luax_checktype<EdgeShape>(L, idx, EdgeShape::type);
 }
 
 int w_EdgeShape_setNextVertex(lua_State *L)
@@ -105,7 +105,7 @@ static const luaL_Reg w_EdgeShape_functions[] =
 
 extern "C" int luaopen_edgeshape(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_EDGE_SHAPE_ID, "EdgeShape", w_Shape_functions, w_EdgeShape_functions, nullptr);
+	return luax_register_type(L, EdgeShape::type, "EdgeShape", w_Shape_functions, w_EdgeShape_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/physics/box2d/wrap_Fixture.cpp b/src/modules/physics/box2d/wrap_Fixture.cpp
index 6074c256d..335f68f35 100644
--- a/src/modules/physics/box2d/wrap_Fixture.cpp
+++ b/src/modules/physics/box2d/wrap_Fixture.cpp
@@ -30,7 +30,7 @@ namespace box2d
 
 Fixture *luax_checkfixture(lua_State *L, int idx)
 {
-	Fixture *f = luax_checktype<Fixture>(L, idx, PHYSICS_FIXTURE_ID);
+	Fixture *f = luax_checktype<Fixture>(L, idx, Fixture::type);
 	if (!f->isValid())
 		luaL_error(L, "Attempt to use destroyed fixture.");
 	return f;
@@ -111,7 +111,7 @@ int w_Fixture_getBody(lua_State *L)
 	Body *body = t->getBody();
 	if (body == 0)
 		return 0;
-	luax_pushtype(L, PHYSICS_BODY_ID, body);
+	luax_pushtype(L, Body::type, body);
 	return 1;
 }
 
@@ -124,19 +124,19 @@ int w_Fixture_getShape(lua_State *L)
 	switch (shape->getType())
 	{
 	case Shape::SHAPE_EDGE:
-		luax_pushtype(L, PHYSICS_EDGE_SHAPE_ID, shape);
+		luax_pushtype(L, EdgeShape::type, shape);
 		break;
 	case Shape::SHAPE_CHAIN:
-		luax_pushtype(L, PHYSICS_CHAIN_SHAPE_ID, shape);
+		luax_pushtype(L, ChainShape::type, shape);
 		break;
 	case Shape::SHAPE_CIRCLE:
-		luax_pushtype(L, PHYSICS_CIRCLE_SHAPE_ID, shape);
+		luax_pushtype(L, CircleShape::type, shape);
 		break;
 	case Shape::SHAPE_POLYGON:
-		luax_pushtype(L, PHYSICS_POLYGON_SHAPE_ID, shape);
+		luax_pushtype(L, PolygonShape::type, shape);
 		break;
 	default:
-		luax_pushtype(L, PHYSICS_SHAPE_ID, shape);
+		luax_pushtype(L, Shape::type, shape);
 		break;
 	}
 	return 1;
@@ -263,7 +263,7 @@ int w_Fixture_destroy(lua_State *L)
 
 int w_Fixture_isDestroyed(lua_State *L)
 {
-	Fixture *f = luax_checktype<Fixture>(L, 1, PHYSICS_FIXTURE_ID);
+	Fixture *f = luax_checktype<Fixture>(L, 1, Fixture::type);
 	luax_pushboolean(L, !f->isValid());
 	return 1;
 }
@@ -302,7 +302,7 @@ static const luaL_Reg w_Fixture_functions[] =
 
 extern "C" int luaopen_fixture(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_FIXTURE_ID, "Fixture", w_Fixture_functions, nullptr);
+	return luax_register_type(L, Fixture::type, "Fixture", w_Fixture_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/physics/box2d/wrap_FrictionJoint.cpp b/src/modules/physics/box2d/wrap_FrictionJoint.cpp
index c03a9edc2..ae829939c 100644
--- a/src/modules/physics/box2d/wrap_FrictionJoint.cpp
+++ b/src/modules/physics/box2d/wrap_FrictionJoint.cpp
@@ -30,7 +30,7 @@ namespace box2d
 
 FrictionJoint *luax_checkfrictionjoint(lua_State *L, int idx)
 {
-	FrictionJoint *j = luax_checktype<FrictionJoint>(L, idx, PHYSICS_FRICTION_JOINT_ID);
+	FrictionJoint *j = luax_checktype<FrictionJoint>(L, idx, FrictionJoint::type);
 	if (!j->isValid())
 		luaL_error(L, "Attempt to use destroyed joint.");
 	return j;
@@ -77,7 +77,7 @@ static const luaL_Reg w_FrictionJoint_functions[] =
 
 extern "C" int luaopen_frictionjoint(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_FRICTION_JOINT_ID, "FrictionJoint", w_Joint_functions, w_FrictionJoint_functions, nullptr);
+	return luax_register_type(L, FrictionJoint::type, "FrictionJoint", w_Joint_functions, w_FrictionJoint_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/physics/box2d/wrap_GearJoint.cpp b/src/modules/physics/box2d/wrap_GearJoint.cpp
index 3738ebd9d..0339e6a70 100644
--- a/src/modules/physics/box2d/wrap_GearJoint.cpp
+++ b/src/modules/physics/box2d/wrap_GearJoint.cpp
@@ -30,7 +30,7 @@ namespace box2d
 
 GearJoint *luax_checkgearjoint(lua_State *L, int idx)
 {
-	GearJoint *j = luax_checktype<GearJoint>(L, idx, PHYSICS_GEAR_JOINT_ID);
+	GearJoint *j = luax_checktype<GearJoint>(L, idx, GearJoint::type);
 	if (!j->isValid())
 		luaL_error(L, "Attempt to use destroyed joint.");
 	return j;
@@ -77,7 +77,7 @@ static const luaL_Reg w_GearJoint_functions[] =
 
 extern "C" int luaopen_gearjoint(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_GEAR_JOINT_ID, "GearJoint", w_Joint_functions, w_GearJoint_functions, nullptr);
+	return luax_register_type(L, GearJoint::type, "GearJoint", w_Joint_functions, w_GearJoint_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/physics/box2d/wrap_Joint.cpp b/src/modules/physics/box2d/wrap_Joint.cpp
index eadb1a93d..23b6d42ed 100644
--- a/src/modules/physics/box2d/wrap_Joint.cpp
+++ b/src/modules/physics/box2d/wrap_Joint.cpp
@@ -22,6 +22,17 @@
 #include "wrap_Joint.h"
 #include "common/StringMap.h"
 #include "Body.h"
+#include "DistanceJoint.h"
+#include "RevoluteJoint.h"
+#include "PrismaticJoint.h"
+#include "MouseJoint.h"
+#include "PulleyJoint.h"
+#include "GearJoint.h"
+#include "FrictionJoint.h"
+#include "WeldJoint.h"
+#include "WheelJoint.h"
+#include "RopeJoint.h"
+#include "MotorJoint.h"
 
 namespace love
 {
@@ -38,27 +49,27 @@ void luax_pushjoint(lua_State *L, Joint *j)
 	switch (j->getType())
 	{
 	case Joint::JOINT_DISTANCE:
-		return luax_pushtype(L, PHYSICS_DISTANCE_JOINT_ID, j);
+		return luax_pushtype(L, DistanceJoint::type, j);
 	case Joint::JOINT_REVOLUTE:
-		return luax_pushtype(L, PHYSICS_REVOLUTE_JOINT_ID, j);
+		return luax_pushtype(L, RevoluteJoint::type, j);
 	case Joint::JOINT_PRISMATIC:
-		return luax_pushtype(L, PHYSICS_PRISMATIC_JOINT_ID, j);
+		return luax_pushtype(L, PrismaticJoint::type, j);
 	case Joint::JOINT_MOUSE:
-		return luax_pushtype(L, PHYSICS_MOUSE_JOINT_ID, j);
+		return luax_pushtype(L, MouseJoint::type, j);
 	case Joint::JOINT_PULLEY:
-		return luax_pushtype(L, PHYSICS_PULLEY_JOINT_ID, j);
+		return luax_pushtype(L, PulleyJoint::type, j);
 	case Joint::JOINT_GEAR:
-		return luax_pushtype(L, PHYSICS_GEAR_JOINT_ID, j);
+		return luax_pushtype(L, GearJoint::type, j);
 	case Joint::JOINT_FRICTION:
-		return luax_pushtype(L, PHYSICS_FRICTION_JOINT_ID, j);
+		return luax_pushtype(L, FrictionJoint::type, j);
 	case Joint::JOINT_WELD:
-		return luax_pushtype(L, PHYSICS_WELD_JOINT_ID, j);
+		return luax_pushtype(L, WeldJoint::type, j);
 	case Joint::JOINT_WHEEL:
-		return luax_pushtype(L, PHYSICS_WHEEL_JOINT_ID, j);
+		return luax_pushtype(L, WheelJoint::type, j);
 	case Joint::JOINT_ROPE:
-		return luax_pushtype(L, PHYSICS_ROPE_JOINT_ID, j);
+		return luax_pushtype(L, RopeJoint::type, j);
 	case Joint::JOINT_MOTOR:
-		return luax_pushtype(L, PHYSICS_MOTOR_JOINT_ID, j);
+		return luax_pushtype(L, MotorJoint::type, j);
 	default:
 		return lua_pushnil(L);
 	}
@@ -66,7 +77,7 @@ void luax_pushjoint(lua_State *L, Joint *j)
 
 Joint *luax_checkjoint(lua_State *L, int idx)
 {
-	Joint *t = luax_checktype<Joint>(L, idx, PHYSICS_JOINT_ID);
+	Joint *t = luax_checktype<Joint>(L, idx, Joint::type);
 	if (!t->isValid())
 		luaL_error(L, "Attempt to use destroyed joint.");
 	return t;
@@ -92,8 +103,8 @@ int w_Joint_getBodies(lua_State *L)
 		b2 = t->getBodyB();
 	});
 
-	luax_pushtype(L, PHYSICS_BODY_ID, b1);
-	luax_pushtype(L, PHYSICS_BODY_ID, b2);
+	luax_pushtype(L, Body::type, b1);
+	luax_pushtype(L, Body::type, b2);
 	return 2;
 }
 
@@ -149,7 +160,7 @@ int w_Joint_destroy(lua_State *L)
 
 int w_Joint_isDestroyed(lua_State *L)
 {
-	Joint *t = luax_checktype<Joint>(L, 1, PHYSICS_JOINT_ID);
+	Joint *t = luax_checktype<Joint>(L, 1, Joint::type);
 	luax_pushboolean(L, !t->isValid());
 	return 1;
 }
@@ -171,7 +182,7 @@ const luaL_Reg w_Joint_functions[] =
 
 extern "C" int luaopen_joint(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_JOINT_ID, "Joint", w_Joint_functions, nullptr);
+	return luax_register_type(L, Joint::type, "Joint", w_Joint_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/physics/box2d/wrap_MotorJoint.cpp b/src/modules/physics/box2d/wrap_MotorJoint.cpp
index 99d6e6165..4d4a5e634 100644
--- a/src/modules/physics/box2d/wrap_MotorJoint.cpp
+++ b/src/modules/physics/box2d/wrap_MotorJoint.cpp
@@ -29,7 +29,7 @@ namespace box2d
 
 MotorJoint *luax_checkmotorjoint(lua_State *L, int idx)
 {
-	MotorJoint *j = luax_checktype<MotorJoint>(L, idx, PHYSICS_MOTOR_JOINT_ID);
+	MotorJoint *j = luax_checktype<MotorJoint>(L, idx, MotorJoint::type);
 	if (!j->isValid())
 		luaL_error(L, "Attempt to use destroyed joint.");
 	return j;
@@ -127,7 +127,7 @@ static const luaL_Reg w_MotorJoint_functions[] =
 
 extern "C" int luaopen_motorjoint(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_MOTOR_JOINT_ID, "MotorJoint", w_Joint_functions, w_MotorJoint_functions, nullptr);
+	return luax_register_type(L, MotorJoint::type, "MotorJoint", w_Joint_functions, w_MotorJoint_functions, nullptr);
 }
 
 
diff --git a/src/modules/physics/box2d/wrap_MouseJoint.cpp b/src/modules/physics/box2d/wrap_MouseJoint.cpp
index 741eeee9e..30b8323c0 100644
--- a/src/modules/physics/box2d/wrap_MouseJoint.cpp
+++ b/src/modules/physics/box2d/wrap_MouseJoint.cpp
@@ -29,7 +29,7 @@ namespace box2d
 
 MouseJoint *luax_checkmousejoint(lua_State *L, int idx)
 {
-	MouseJoint *j = luax_checktype<MouseJoint>(L, idx, PHYSICS_MOUSE_JOINT_ID);
+	MouseJoint *j = luax_checktype<MouseJoint>(L, idx, MouseJoint::type);
 	if (!j->isValid())
 		luaL_error(L, "Attempt to use destroyed joint.");
 	return j;
@@ -111,7 +111,7 @@ static const luaL_Reg w_MouseJoint_functions[] =
 
 extern "C" int luaopen_mousejoint(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_MOUSE_JOINT_ID, "MouseJoint", w_Joint_functions, w_MouseJoint_functions, nullptr);
+	return luax_register_type(L, MouseJoint::type, "MouseJoint", w_Joint_functions, w_MouseJoint_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/physics/box2d/wrap_Physics.cpp b/src/modules/physics/box2d/wrap_Physics.cpp
index 27dc7101a..ce993d2b7 100644
--- a/src/modules/physics/box2d/wrap_Physics.cpp
+++ b/src/modules/physics/box2d/wrap_Physics.cpp
@@ -59,7 +59,7 @@ int w_newWorld(lua_State *L)
 
 	World *w;
 	luax_catchexcept(L, [&](){ w = instance()->newWorld(gx, gy, sleep); });
-	luax_pushtype(L, PHYSICS_WORLD_ID, w);
+	luax_pushtype(L, World::type, w);
 	w->release();
 
 	return 1;
@@ -78,7 +78,7 @@ int w_newBody(lua_State *L)
 
 	Body *body;
 	luax_catchexcept(L, [&](){ body = instance()->newBody(world, x, y, btype); });
-	luax_pushtype(L, PHYSICS_BODY_ID, body);
+	luax_pushtype(L, Body::type, body);
 	body->release();
 	return 1;
 }
@@ -90,7 +90,7 @@ int w_newFixture(lua_State *L)
 	float density = (float)luaL_optnumber(L, 3, 1.0f);
 	Fixture *fixture;
 	luax_catchexcept(L, [&](){ fixture = instance()->newFixture(body, shape, density); });
-	luax_pushtype(L, PHYSICS_FIXTURE_ID, fixture);
+	luax_pushtype(L, Fixture::type, fixture);
 	fixture->release();
 	return 1;
 }
@@ -104,7 +104,7 @@ int w_newCircleShape(lua_State *L)
 		float radius = (float)luaL_checknumber(L, 1);
 		CircleShape *shape;
 		luax_catchexcept(L, [&](){ shape = instance()->newCircleShape(radius); });
-		luax_pushtype(L, PHYSICS_CIRCLE_SHAPE_ID, shape);
+		luax_pushtype(L, CircleShape::type, shape);
 		shape->release();
 		return 1;
 	}
@@ -115,7 +115,7 @@ int w_newCircleShape(lua_State *L)
 		float radius = (float)luaL_checknumber(L, 3);
 		CircleShape *shape;
 		luax_catchexcept(L, [&](){ shape = instance()->newCircleShape(x, y, radius); });
-		luax_pushtype(L, PHYSICS_CIRCLE_SHAPE_ID, shape);
+		luax_pushtype(L, CircleShape::type, shape);
 		shape->release();
 		return 1;
 	}
@@ -133,7 +133,7 @@ int w_newRectangleShape(lua_State *L)
 		float h = (float)luaL_checknumber(L, 2);
 		PolygonShape *shape;
 		luax_catchexcept(L, [&](){ shape = instance()->newRectangleShape(w, h); });
-		luax_pushtype(L, PHYSICS_POLYGON_SHAPE_ID, shape);
+		luax_pushtype(L, PolygonShape::type, shape);
 		shape->release();
 		return 1;
 	}
@@ -146,7 +146,7 @@ int w_newRectangleShape(lua_State *L)
 		float angle = (float)luaL_optnumber(L, 5, 0);
 		PolygonShape *shape;
 		luax_catchexcept(L, [&](){ shape = instance()->newRectangleShape(x, y, w, h, angle); });
-		luax_pushtype(L, PHYSICS_POLYGON_SHAPE_ID, shape);
+		luax_pushtype(L, PolygonShape::type, shape);
 		shape->release();
 		return 1;
 	}
@@ -162,7 +162,7 @@ int w_newEdgeShape(lua_State *L)
 	float y2 = (float)luaL_checknumber(L, 4);
 	EdgeShape *shape;
 	luax_catchexcept(L, [&](){ shape = instance()->newEdgeShape(x1, y1, x2, y2); });
-	luax_pushtype(L, PHYSICS_EDGE_SHAPE_ID, shape);
+	luax_pushtype(L, EdgeShape::type, shape);
 	shape->release();
 	return 1;
 }
@@ -194,7 +194,7 @@ int w_newDistanceJoint(lua_State *L)
 	luax_catchexcept(L, [&]() {
 		j = instance()->newDistanceJoint(body1, body2, x1, y1, x2, y2, collideConnected);
 	});
-	luax_pushtype(L, PHYSICS_DISTANCE_JOINT_ID, j);
+	luax_pushtype(L, DistanceJoint::type, j);
 	j->release();
 	return 1;
 }
@@ -206,7 +206,7 @@ int w_newMouseJoint(lua_State *L)
 	float y = (float)luaL_checknumber(L, 3);
 	MouseJoint *j;
 	luax_catchexcept(L, [&](){ j = instance()->newMouseJoint(body, x, y); });
-	luax_pushtype(L, PHYSICS_MOUSE_JOINT_ID, j);
+	luax_pushtype(L, MouseJoint::type, j);
 	j->release();
 	return 1;
 }
@@ -237,7 +237,7 @@ int w_newRevoluteJoint(lua_State *L)
 	luax_catchexcept(L, [&]() {
 		j = instance()->newRevoluteJoint(body1, body2, xA, yA, xB, yB, collideConnected, referenceAngle);
 	});
-	luax_pushtype(L, PHYSICS_REVOLUTE_JOINT_ID, j);
+	luax_pushtype(L, RevoluteJoint::type, j);
 	j->release();
 	return 1;
 }
@@ -272,7 +272,7 @@ int w_newPrismaticJoint(lua_State *L)
 	luax_catchexcept(L, [&]() {
 		j = instance()->newPrismaticJoint(body1, body2, xA, yA, xB, yB, ax, ay, collideConnected, referenceAngle);
 	});
-	luax_pushtype(L, PHYSICS_PRISMATIC_JOINT_ID, j);
+	luax_pushtype(L, PrismaticJoint::type, j);
 	j->release();
 	return 1;
 }
@@ -296,7 +296,7 @@ int w_newPulleyJoint(lua_State *L)
 	luax_catchexcept(L, [&]() {
 		j = instance()->newPulleyJoint(body1, body2, b2Vec2(gx1,gy1), b2Vec2(gx2,gy2), b2Vec2(x1,y1), b2Vec2(x2,y2), ratio, collideConnected);
 	});
-	luax_pushtype(L, PHYSICS_PULLEY_JOINT_ID, j);
+	luax_pushtype(L, PulleyJoint::type, j);
 	j->release();
 	return 1;
 }
@@ -312,7 +312,7 @@ int w_newGearJoint(lua_State *L)
 	luax_catchexcept(L, [&]() {
 		j = instance()->newGearJoint(joint1, joint2, ratio, collideConnected);
 	});
-	luax_pushtype(L, PHYSICS_GEAR_JOINT_ID, j);
+	luax_pushtype(L, GearJoint::type, j);
 	j->release();
 	return 1;
 }
@@ -341,7 +341,7 @@ int w_newFrictionJoint(lua_State *L)
 	luax_catchexcept(L, [&]() {
 		j = instance()->newFrictionJoint(body1, body2, xA, yA, xB, yB, collideConnected);
 	});
-	luax_pushtype(L, PHYSICS_FRICTION_JOINT_ID, j);
+	luax_pushtype(L, FrictionJoint::type, j);
 	j->release();
 	return 1;
 }
@@ -372,7 +372,7 @@ int w_newWeldJoint(lua_State *L)
 	luax_catchexcept(L, [&]() {
 		j = instance()->newWeldJoint(body1, body2, xA, yA, xB, yB, collideConnected, referenceAngle);
 	});
-	luax_pushtype(L, PHYSICS_WELD_JOINT_ID, j);
+	luax_pushtype(L, WeldJoint::type, j);
 	j->release();
 	return 1;
 }
@@ -406,7 +406,7 @@ int w_newWheelJoint(lua_State *L)
 	luax_catchexcept(L, [&]() {
 		j = instance()->newWheelJoint(body1, body2, xA, yA, xB, yB, ax, ay, collideConnected);
 	});
-	luax_pushtype(L, PHYSICS_WHEEL_JOINT_ID, j);
+	luax_pushtype(L, WheelJoint::type, j);
 	j->release();
 	return 1;
 }
@@ -425,7 +425,7 @@ int w_newRopeJoint(lua_State *L)
 	luax_catchexcept(L, [&]() {
 		j = instance()->newRopeJoint(body1, body2, x1, y1, x2, y2, maxLength, collideConnected);
 	});
-	luax_pushtype(L, PHYSICS_ROPE_JOINT_ID, j);
+	luax_pushtype(L, RopeJoint::type, j);
 	j->release();
 	return 1;
 }
@@ -447,7 +447,7 @@ int w_newMotorJoint(lua_State *L)
 	{
 		luax_catchexcept(L, [&](){ j = instance()->newMotorJoint(body1, body2); });
 	}
-	luax_pushtype(L, PHYSICS_MOTOR_JOINT_ID, j);
+	luax_pushtype(L, MotorJoint::type, j);
 	j->release();
 	return 1;
 }
@@ -537,7 +537,7 @@ extern "C" int luaopen_love_physics(lua_State *L)
 	WrappedModule w;
 	w.module = instance;
 	w.name = "physics";
-	w.type = MODULE_ID;
+	w.type = &Module::type;
 	w.functions = functions;
 	w.types = types;
 
diff --git a/src/modules/physics/box2d/wrap_PolygonShape.cpp b/src/modules/physics/box2d/wrap_PolygonShape.cpp
index 44e7c942f..c9bcb2f19 100644
--- a/src/modules/physics/box2d/wrap_PolygonShape.cpp
+++ b/src/modules/physics/box2d/wrap_PolygonShape.cpp
@@ -29,7 +29,7 @@ namespace box2d
 
 PolygonShape *luax_checkpolygonshape(lua_State *L, int idx)
 {
-	return luax_checktype<PolygonShape>(L, idx, PHYSICS_POLYGON_SHAPE_ID);
+	return luax_checktype<PolygonShape>(L, idx, PolygonShape::type);
 }
 
 int w_PolygonShape_getPoints(lua_State *L)
@@ -55,7 +55,7 @@ static const luaL_Reg w_PolygonShape_functions[] =
 
 extern "C" int luaopen_polygonshape(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_POLYGON_SHAPE_ID, "PolygonShape", w_Shape_functions, w_PolygonShape_functions, nullptr);
+	return luax_register_type(L, PolygonShape::type, "PolygonShape", w_Shape_functions, w_PolygonShape_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/physics/box2d/wrap_PrismaticJoint.cpp b/src/modules/physics/box2d/wrap_PrismaticJoint.cpp
index a8c07331e..6efb068db 100644
--- a/src/modules/physics/box2d/wrap_PrismaticJoint.cpp
+++ b/src/modules/physics/box2d/wrap_PrismaticJoint.cpp
@@ -30,7 +30,7 @@ namespace box2d
 
 PrismaticJoint *luax_checkprismaticjoint(lua_State *L, int idx)
 {
-	PrismaticJoint *j = luax_checktype<PrismaticJoint>(L, idx, PHYSICS_PRISMATIC_JOINT_ID);
+	PrismaticJoint *j = luax_checktype<PrismaticJoint>(L, idx, PrismaticJoint::type);
 	if (!j->isValid())
 		luaL_error(L, "Attempt to use destroyed joint.");
 	return j;
@@ -204,7 +204,7 @@ static const luaL_Reg w_PrismaticJoint_functions[] =
 
 extern "C" int luaopen_prismaticjoint(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_PRISMATIC_JOINT_ID, "PrismaticJoint", w_Joint_functions, w_PrismaticJoint_functions, nullptr);
+	return luax_register_type(L, PrismaticJoint::type, "PrismaticJoint", w_Joint_functions, w_PrismaticJoint_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/physics/box2d/wrap_PulleyJoint.cpp b/src/modules/physics/box2d/wrap_PulleyJoint.cpp
index 1e6234881..e379acc84 100644
--- a/src/modules/physics/box2d/wrap_PulleyJoint.cpp
+++ b/src/modules/physics/box2d/wrap_PulleyJoint.cpp
@@ -29,7 +29,7 @@ namespace box2d
 
 PulleyJoint *luax_checkpulleyjoint(lua_State *L, int idx)
 {
-	PulleyJoint *j = luax_checktype<PulleyJoint>(L, idx, PHYSICS_PULLEY_JOINT_ID);
+	PulleyJoint *j = luax_checktype<PulleyJoint>(L, idx, PulleyJoint::type);
 	if (!j->isValid())
 		luaL_error(L, "Attempt to use destroyed joint.");
 	return j;
@@ -74,7 +74,7 @@ static const luaL_Reg w_PulleyJoint_functions[] =
 
 extern "C" int luaopen_pulleyjoint(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_PULLEY_JOINT_ID, "PulleyJoint", w_Joint_functions, w_PulleyJoint_functions, nullptr);
+	return luax_register_type(L, PulleyJoint::type, "PulleyJoint", w_Joint_functions, w_PulleyJoint_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/physics/box2d/wrap_RevoluteJoint.cpp b/src/modules/physics/box2d/wrap_RevoluteJoint.cpp
index 10ef10580..0b283947d 100644
--- a/src/modules/physics/box2d/wrap_RevoluteJoint.cpp
+++ b/src/modules/physics/box2d/wrap_RevoluteJoint.cpp
@@ -30,7 +30,7 @@ namespace box2d
 
 RevoluteJoint *luax_checkrevolutejoint(lua_State *L, int idx)
 {
-	RevoluteJoint *j = luax_checktype<RevoluteJoint>(L, idx, PHYSICS_REVOLUTE_JOINT_ID);
+	RevoluteJoint *j = luax_checktype<RevoluteJoint>(L, idx, RevoluteJoint::type);
 	if (!j->isValid())
 		luaL_error(L, "Attempt to use destroyed joint.");
 	return j;
@@ -196,7 +196,7 @@ static const luaL_Reg w_RevoluteJoint_functions[] =
 
 extern "C" int luaopen_revolutejoint(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_REVOLUTE_JOINT_ID, "RevoluteJoint", w_Joint_functions, w_RevoluteJoint_functions, nullptr);
+	return luax_register_type(L, RevoluteJoint::type, "RevoluteJoint", w_Joint_functions, w_RevoluteJoint_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/physics/box2d/wrap_RopeJoint.cpp b/src/modules/physics/box2d/wrap_RopeJoint.cpp
index 926354a55..2b8e302a1 100644
--- a/src/modules/physics/box2d/wrap_RopeJoint.cpp
+++ b/src/modules/physics/box2d/wrap_RopeJoint.cpp
@@ -29,7 +29,7 @@ namespace box2d
 
 RopeJoint *luax_checkropejoint(lua_State *L, int idx)
 {
-	RopeJoint *j = luax_checktype<RopeJoint>(L, idx, PHYSICS_ROPE_JOINT_ID);
+	RopeJoint *j = luax_checktype<RopeJoint>(L, idx, RopeJoint::type);
 	if (!j->isValid())
 		luaL_error(L, "Attempt to use destroyed joint.");
 	return j;
@@ -50,7 +50,7 @@ static const luaL_Reg w_RopeJoint_functions[] =
 
 extern "C" int luaopen_ropejoint(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_ROPE_JOINT_ID, "RopeJoint", w_Joint_functions, w_RopeJoint_functions, nullptr);
+	return luax_register_type(L, RopeJoint::type, "RopeJoint", w_Joint_functions, w_RopeJoint_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/physics/box2d/wrap_Shape.cpp b/src/modules/physics/box2d/wrap_Shape.cpp
index b7646f57b..369015a7f 100644
--- a/src/modules/physics/box2d/wrap_Shape.cpp
+++ b/src/modules/physics/box2d/wrap_Shape.cpp
@@ -30,7 +30,7 @@ namespace box2d
 
 Shape *luax_checkshape(lua_State *L, int idx)
 {
-	return luax_checktype<Shape>(L, idx, PHYSICS_SHAPE_ID);
+	return luax_checktype<Shape>(L, idx, Shape::type);
 }
 
 int w_Shape_getType(lua_State *L)
@@ -108,7 +108,7 @@ const luaL_Reg w_Shape_functions[] =
 
 extern "C" int luaopen_shape(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_SHAPE_ID, "Shape", w_Shape_functions, nullptr);
+	return luax_register_type(L, Shape::type, "Shape", w_Shape_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/physics/box2d/wrap_WeldJoint.cpp b/src/modules/physics/box2d/wrap_WeldJoint.cpp
index 92efc52a6..c88f4e00b 100644
--- a/src/modules/physics/box2d/wrap_WeldJoint.cpp
+++ b/src/modules/physics/box2d/wrap_WeldJoint.cpp
@@ -29,7 +29,7 @@ namespace box2d
 
 WeldJoint *luax_checkweldjoint(lua_State *L, int idx)
 {
-	WeldJoint *j = luax_checktype<WeldJoint>(L, idx, PHYSICS_WELD_JOINT_ID);
+	WeldJoint *j = luax_checktype<WeldJoint>(L, idx, WeldJoint::type);
 	if (!j->isValid())
 		luaL_error(L, "Attempt to use destroyed joint.");
 	return j;
@@ -84,7 +84,7 @@ static const luaL_Reg w_WeldJoint_functions[] =
 
 extern "C" int luaopen_weldjoint(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_WELD_JOINT_ID, "WeldJoint", w_Joint_functions, w_WeldJoint_functions, nullptr);
+	return luax_register_type(L, WeldJoint::type, "WeldJoint", w_Joint_functions, w_WeldJoint_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/physics/box2d/wrap_WheelJoint.cpp b/src/modules/physics/box2d/wrap_WheelJoint.cpp
index 4a6ee66b7..36f3651f9 100644
--- a/src/modules/physics/box2d/wrap_WheelJoint.cpp
+++ b/src/modules/physics/box2d/wrap_WheelJoint.cpp
@@ -29,7 +29,7 @@ namespace box2d
 
 WheelJoint *luax_checkwheeljoint(lua_State *L, int idx)
 {
-	WheelJoint *j = luax_checktype<WheelJoint>(L, idx, PHYSICS_WHEEL_JOINT_ID);
+	WheelJoint *j = luax_checktype<WheelJoint>(L, idx, WheelJoint::type);
 	if (!j->isValid())
 		luaL_error(L, "Attempt to use destroyed joint.");
 	return j;
@@ -160,7 +160,7 @@ static const luaL_Reg w_WheelJoint_functions[] =
 
 extern "C" int luaopen_wheeljoint(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_WHEEL_JOINT_ID, "WheelJoint", w_Joint_functions, w_WheelJoint_functions, nullptr);
+	return luax_register_type(L, WheelJoint::type, "WheelJoint", w_Joint_functions, w_WheelJoint_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/physics/box2d/wrap_World.cpp b/src/modules/physics/box2d/wrap_World.cpp
index 0319b272a..c1a984e79 100644
--- a/src/modules/physics/box2d/wrap_World.cpp
+++ b/src/modules/physics/box2d/wrap_World.cpp
@@ -29,7 +29,7 @@ namespace box2d
 
 World *luax_checkworld(lua_State *L, int idx)
 {
-	World *w = luax_checktype<World>(L, idx, PHYSICS_WORLD_ID);
+	World *w = luax_checktype<World>(L, idx, World::type);
 	if (!w->isValid())
 		luaL_error(L, "Attempt to use destroyed world.");
 	return w;
@@ -203,7 +203,7 @@ int w_World_destroy(lua_State *L)
 
 int w_World_isDestroyed(lua_State *L)
 {
-	World *w = luax_checktype<World>(L, 1, PHYSICS_WORLD_ID);
+	World *w = luax_checktype<World>(L, 1, World::type);
 	luax_pushboolean(L, !w->isValid());
 	return 1;
 }
@@ -237,7 +237,7 @@ static const luaL_Reg w_World_functions[] =
 
 extern "C" int luaopen_world(lua_State *L)
 {
-	return luax_register_type(L, PHYSICS_WORLD_ID, "World", w_World_functions, nullptr);
+	return luax_register_type(L, World::type, "World", w_World_functions, nullptr);
 }
 
 } // box2d
diff --git a/src/modules/sound/Decoder.cpp b/src/modules/sound/Decoder.cpp
index 93805e458..9dc8678f2 100644
--- a/src/modules/sound/Decoder.cpp
+++ b/src/modules/sound/Decoder.cpp
@@ -27,6 +27,8 @@ namespace love
 namespace sound
 {
 
+love::Type Decoder::type(&Object::type);
+
 Decoder::Decoder(Data *data, const std::string &ext, int bufferSize)
 	: data(data)
 	, ext(ext)
diff --git a/src/modules/sound/Decoder.h b/src/modules/sound/Decoder.h
index 11683dafb..d092f9bd5 100644
--- a/src/modules/sound/Decoder.h
+++ b/src/modules/sound/Decoder.h
@@ -39,6 +39,8 @@ class Decoder : public Object
 {
 public:
 
+	static love::Type type;
+
 	Decoder(Data *data, const std::string &ext, int bufferSize);
 	virtual ~Decoder();
 
diff --git a/src/modules/sound/Sound.cpp b/src/modules/sound/Sound.cpp
index 38417aeb4..19f41cad3 100644
--- a/src/modules/sound/Sound.cpp
+++ b/src/modules/sound/Sound.cpp
@@ -25,6 +25,8 @@ namespace love
 namespace sound
 {
 
+love::Type Sound::type(&Module::type);
+
 Sound::~Sound()
 {
 }
diff --git a/src/modules/sound/Sound.h b/src/modules/sound/Sound.h
index cd53ccfe5..9db3aab22 100644
--- a/src/modules/sound/Sound.h
+++ b/src/modules/sound/Sound.h
@@ -42,6 +42,8 @@ class Sound : public Module
 
 public:
 
+	static love::Type type;
+
 	virtual ~Sound();
 
 	// Implements Module.
diff --git a/src/modules/sound/SoundData.cpp b/src/modules/sound/SoundData.cpp
index 5e0068867..7be4a6ece 100644
--- a/src/modules/sound/SoundData.cpp
+++ b/src/modules/sound/SoundData.cpp
@@ -34,6 +34,8 @@ namespace love
 namespace sound
 {
 
+love::Type SoundData::type(&Data::type);
+
 SoundData::SoundData(Decoder *decoder)
 	: data(0)
 	, size(0)
diff --git a/src/modules/sound/SoundData.h b/src/modules/sound/SoundData.h
index 07b13c2d3..78852c625 100644
--- a/src/modules/sound/SoundData.h
+++ b/src/modules/sound/SoundData.h
@@ -35,6 +35,8 @@ class SoundData : public love::Data
 {
 public:
 
+	static love::Type type;
+
 	SoundData(Decoder *decoder);
 	SoundData(int samples, int sampleRate, int bitDepth, int channels);
 	SoundData(void *d, int samples, int sampleRate, int bitDepth, int channels);
diff --git a/src/modules/sound/wrap_Decoder.cpp b/src/modules/sound/wrap_Decoder.cpp
index e9039f713..bc9c807eb 100644
--- a/src/modules/sound/wrap_Decoder.cpp
+++ b/src/modules/sound/wrap_Decoder.cpp
@@ -31,7 +31,7 @@ namespace sound
 
 Decoder *luax_checkdecoder(lua_State *L, int idx)
 {
-	return luax_checktype<Decoder>(L, idx, SOUND_DECODER_ID);
+	return luax_checktype<Decoder>(L, idx, Decoder::type);
 }
 
 int w_Decoder_getChannels(lua_State *L)
@@ -74,7 +74,7 @@ int w_Decoder_decode(lua_State *L)
 				decoded / (t->getBitDepth() / 8 * t->getChannels()),
 				t->getSampleRate(), t->getBitDepth(), t->getChannels());
 
-			luax_pushtype(L, SOUND_SOUND_DATA_ID, s);
+			luax_pushtype(L, SoundData::type, s);
 			s->release();
 		});
 	}
@@ -109,7 +109,7 @@ static const luaL_Reg w_Decoder_functions[] =
 
 extern "C" int luaopen_decoder(lua_State *L)
 {
-	return luax_register_type(L, SOUND_DECODER_ID, "Decoder", w_Decoder_functions, nullptr);
+	return luax_register_type(L, Decoder::type, "Decoder", w_Decoder_functions, nullptr);
 }
 
 } // sound
diff --git a/src/modules/sound/wrap_Sound.cpp b/src/modules/sound/wrap_Sound.cpp
index abc4d4bf7..50656602e 100644
--- a/src/modules/sound/wrap_Sound.cpp
+++ b/src/modules/sound/wrap_Sound.cpp
@@ -46,7 +46,7 @@ int w_newDecoder(lua_State *L)
 	if (t == nullptr)
 		return luaL_error(L, "Extension \"%s\" not supported.", data->getExtension().c_str());
 
-	luax_pushtype(L, SOUND_DECODER_ID, t);
+	luax_pushtype(L, Decoder::type, t);
 	t->release();
 	return 1;
 }
@@ -68,7 +68,7 @@ int w_newSoundData(lua_State *L)
 	else
 	{
 		// Convert to Decoder, if necessary.
-		if (!luax_istype(L, 1, SOUND_DECODER_ID))
+		if (!luax_istype(L, 1, Decoder::type))
 		{
 			w_newDecoder(L);
 			lua_replace(L, 1);
@@ -77,7 +77,7 @@ int w_newSoundData(lua_State *L)
 		luax_catchexcept(L, [&](){ t = instance()->newSoundData(luax_checkdecoder(L, 1)); });
 	}
 
-	luax_pushtype(L, SOUND_SOUND_DATA_ID, t);
+	luax_pushtype(L, SoundData::type, t);
 	t->release();
 	return 1;
 }
@@ -111,7 +111,7 @@ extern "C" int luaopen_love_sound(lua_State *L)
 	WrappedModule w;
 	w.module = instance;
 	w.name = "sound";
-	w.type = MODULE_SOUND_ID;
+	w.type = &Sound::type;
 	w.functions = functions;
 	w.types = types;
 
diff --git a/src/modules/sound/wrap_SoundData.cpp b/src/modules/sound/wrap_SoundData.cpp
index abd922f44..ff5a32a3b 100644
--- a/src/modules/sound/wrap_SoundData.cpp
+++ b/src/modules/sound/wrap_SoundData.cpp
@@ -39,7 +39,7 @@ namespace sound
 
 SoundData *luax_checksounddata(lua_State *L, int idx)
 {
-	return luax_checktype<SoundData>(L, idx, SOUND_SOUND_DATA_ID);
+	return luax_checktype<SoundData>(L, idx, SoundData::type);
 }
 
 int w_SoundData_getChannels(lua_State *L)
@@ -110,9 +110,9 @@ static const luaL_Reg w_SoundData_functions[] =
 
 extern "C" int luaopen_sounddata(lua_State *L)
 {
-	int ret = luax_register_type(L, SOUND_SOUND_DATA_ID, "SoundData", w_Data_functions, w_SoundData_functions, nullptr);
+	int ret = luax_register_type(L, SoundData::type, "SoundData", w_Data_functions, w_SoundData_functions, nullptr);
 
-	luax_gettypemetatable(L, SOUND_SOUND_DATA_ID);
+	luax_gettypemetatable(L, SoundData::type);
 
 	// Load and execute SoundData.lua, sending the metatable as an argument.
 	if (lua_istable(L, -1))
diff --git a/src/modules/system/wrap_System.cpp b/src/modules/system/wrap_System.cpp
index a299583f8..809027ea1 100644
--- a/src/modules/system/wrap_System.cpp
+++ b/src/modules/system/wrap_System.cpp
@@ -118,7 +118,7 @@ extern "C" int luaopen_love_system(lua_State *L)
 	WrappedModule w;
 	w.module = instance;
 	w.name = "system";
-	w.type = MODULE_ID;
+	w.type = &Module::type;
 	w.functions = functions;
 	w.types = nullptr;
 
diff --git a/src/modules/thread/Channel.cpp b/src/modules/thread/Channel.cpp
index d1514d2d4..08e375654 100644
--- a/src/modules/thread/Channel.cpp
+++ b/src/modules/thread/Channel.cpp
@@ -27,6 +27,7 @@ namespace love
 namespace thread
 {
 
+love::Type Channel::type(&Object::type);
 static std::map<std::string, Channel *> namedChannels;
 static Mutex *namedChannelMutex;
 
diff --git a/src/modules/thread/Channel.h b/src/modules/thread/Channel.h
index 5a5dafe68..00325fe1c 100644
--- a/src/modules/thread/Channel.h
+++ b/src/modules/thread/Channel.h
@@ -42,6 +42,8 @@ friend int w_Channel_performAtomic(lua_State *);
 
 public:
 
+	static love::Type type;
+
 	Channel();
 	~Channel();
 
diff --git a/src/modules/thread/LuaThread.cpp b/src/modules/thread/LuaThread.cpp
index d7150a31a..8293e5f6c 100644
--- a/src/modules/thread/LuaThread.cpp
+++ b/src/modules/thread/LuaThread.cpp
@@ -30,6 +30,9 @@ namespace love
 {
 namespace thread
 {
+
+love::Type LuaThread::type(&Threadable::type);
+
 LuaThread::LuaThread(const std::string &name, love::Data *code)
 	: code(code)
 	, name(name)
@@ -105,7 +108,7 @@ void LuaThread::onError()
 		return;
 
 	Proxy p;
-	p.type = THREAD_THREAD_ID;
+	p.type = &LuaThread::type;
 	p.object = this;
 
 	std::vector<Variant> vargs = {
diff --git a/src/modules/thread/LuaThread.h b/src/modules/thread/LuaThread.h
index 169dce6f6..4a2d81b33 100644
--- a/src/modules/thread/LuaThread.h
+++ b/src/modules/thread/LuaThread.h
@@ -40,6 +40,8 @@ class LuaThread : public Threadable
 {
 public:
 
+	static love::Type type;
+
 	LuaThread(const std::string &name, love::Data *code);
 	virtual ~LuaThread();
 	void threadFunction();
diff --git a/src/modules/thread/threads.cpp b/src/modules/thread/threads.cpp
index ad5f314f5..ee4a11fc3 100644
--- a/src/modules/thread/threads.cpp
+++ b/src/modules/thread/threads.cpp
@@ -74,6 +74,8 @@ void EmptyLock::setLock(Mutex &m)
 	mutex = &m;
 }
 
+love::Type Threadable::type(&Object::type);
+
 Threadable::Threadable()
 {
 	owner = newThread(this);
diff --git a/src/modules/thread/threads.h b/src/modules/thread/threads.h
index 0039f7086..059fe2d18 100644
--- a/src/modules/thread/threads.h
+++ b/src/modules/thread/threads.h
@@ -79,6 +79,8 @@ private:
 class Threadable : public love::Object
 {
 public:
+	static love::Type type;
+
 	Threadable();
 	virtual ~Threadable();
 
diff --git a/src/modules/thread/wrap_Channel.cpp b/src/modules/thread/wrap_Channel.cpp
index 813ca02cc..58c846bd8 100644
--- a/src/modules/thread/wrap_Channel.cpp
+++ b/src/modules/thread/wrap_Channel.cpp
@@ -27,7 +27,7 @@ namespace thread
 
 Channel *luax_checkchannel(lua_State *L, int idx)
 {
-	return luax_checktype<Channel>(L, idx, THREAD_CHANNEL_ID);
+	return luax_checktype<Channel>(L, idx, Channel::type);
 }
 
 int w_Channel_push(lua_State *L)
@@ -147,7 +147,7 @@ static const luaL_Reg w_Channel_functions[] =
 
 extern "C" int luaopen_channel(lua_State *L)
 {
-	return luax_register_type(L, THREAD_CHANNEL_ID, "Channel", w_Channel_functions, nullptr);
+	return luax_register_type(L, Channel::type, "Channel", w_Channel_functions, nullptr);
 }
 
 } // thread
diff --git a/src/modules/thread/wrap_LuaThread.cpp b/src/modules/thread/wrap_LuaThread.cpp
index fefe06f1a..2ca8daff3 100644
--- a/src/modules/thread/wrap_LuaThread.cpp
+++ b/src/modules/thread/wrap_LuaThread.cpp
@@ -27,7 +27,7 @@ namespace thread
 
 LuaThread *luax_checkthread(lua_State *L, int idx)
 {
-	return luax_checktype<LuaThread>(L, idx, THREAD_THREAD_ID);
+	return luax_checktype<LuaThread>(L, idx, LuaThread::type);
 }
 
 int w_Thread_start(lua_State *L)
@@ -87,7 +87,7 @@ static const luaL_Reg w_Thread_functions[] =
 
 extern "C" int luaopen_thread(lua_State *L)
 {
-	return luax_register_type(L, THREAD_THREAD_ID, "Thread", w_Thread_functions, nullptr);
+	return luax_register_type(L, LuaThread::type, "Thread", w_Thread_functions, nullptr);
 }
 
 } // thread
diff --git a/src/modules/thread/wrap_ThreadModule.cpp b/src/modules/thread/wrap_ThreadModule.cpp
index 0736188d3..7096bcf85 100644
--- a/src/modules/thread/wrap_ThreadModule.cpp
+++ b/src/modules/thread/wrap_ThreadModule.cpp
@@ -61,22 +61,22 @@ int w_newThread(lua_State *L)
 		else
 			luax_convobj(L, 1, "filesystem", "newFileData");
 	}
-	else if (luax_istype(L, 1, FILESYSTEM_FILE_ID))
+	else if (luax_istype(L, 1, love::filesystem::File::type))
 		luax_convobj(L, 1, "filesystem", "newFileData");
 
-	if (luax_istype(L, 1, FILESYSTEM_FILE_DATA_ID))
+	if (luax_istype(L, 1, love::filesystem::FileData::type))
 	{
-		love::filesystem::FileData *fdata = luax_checktype<love::filesystem::FileData>(L, 1, FILESYSTEM_FILE_DATA_ID);
+		love::filesystem::FileData *fdata = luax_checktype<love::filesystem::FileData>(L, 1, love::filesystem::FileData::type);
 		name = std::string("@") + fdata->getFilename();
 		data = fdata;
 	}
 	else
 	{
-		data = luax_checktype<love::Data>(L, 1, DATA_ID);
+		data = luax_checktype<love::Data>(L, 1, love::Data::type);
 	}
 
 	LuaThread *t = instance()->newThread(name, data);
-	luax_pushtype(L, THREAD_THREAD_ID, t);
+	luax_pushtype(L, LuaThread::type, t);
 	t->release();
 	return 1;
 }
@@ -84,7 +84,7 @@ int w_newThread(lua_State *L)
 int w_newChannel(lua_State *L)
 {
 	Channel *c = instance()->newChannel();
-	luax_pushtype(L, THREAD_CHANNEL_ID, c);
+	luax_pushtype(L, Channel::type, c);
 	c->release();
 	return 1;
 }
@@ -93,7 +93,7 @@ int w_getChannel(lua_State *L)
 {
 	std::string name = luax_checkstring(L, 1);
 	Channel *c = instance()->getChannel(name);
-	luax_pushtype(L, THREAD_CHANNEL_ID, c);
+	luax_pushtype(L, Channel::type, c);
 	c->release();
 	return 1;
 }
@@ -126,7 +126,7 @@ extern "C" int luaopen_love_thread(lua_State *L)
 	WrappedModule w;
 	w.module = instance;
 	w.name = "thread";
-	w.type = MODULE_ID;
+	w.type = &Module::type;
 	w.functions = module_functions;
 	w.types = types;
 
diff --git a/src/modules/timer/wrap_Timer.cpp b/src/modules/timer/wrap_Timer.cpp
index e4c13c1eb..09ea4000e 100644
--- a/src/modules/timer/wrap_Timer.cpp
+++ b/src/modules/timer/wrap_Timer.cpp
@@ -94,7 +94,7 @@ extern "C" int luaopen_love_timer(lua_State *L)
 	WrappedModule w;
 	w.module = instance;
 	w.name = "timer";
-	w.type = MODULE_ID;
+	w.type = &Module::type;
 	w.functions = functions;
 	w.types = 0;
 
diff --git a/src/modules/touch/wrap_Touch.cpp b/src/modules/touch/wrap_Touch.cpp
index 7967f3148..57fd4cc75 100644
--- a/src/modules/touch/wrap_Touch.cpp
+++ b/src/modules/touch/wrap_Touch.cpp
@@ -105,7 +105,7 @@ extern "C" int luaopen_love_touch(lua_State *L)
 	WrappedModule w;
 	w.module = instance;
 	w.name = "touch";
-	w.type = MODULE_ID;
+	w.type = &Module::type;
 	w.functions = functions;
 	w.types = nullptr;
 
diff --git a/src/modules/video/VideoStream.cpp b/src/modules/video/VideoStream.cpp
index b231fde7b..7f8ac934f 100644
--- a/src/modules/video/VideoStream.cpp
+++ b/src/modules/video/VideoStream.cpp
@@ -27,6 +27,8 @@ namespace love
 namespace video
 {
 
+love::Type VideoStream::type(&Stream::type);
+
 void VideoStream::setSync(VideoStream::FrameSync *frameSync)
 {
 	this->frameSync = frameSync;
diff --git a/src/modules/video/VideoStream.h b/src/modules/video/VideoStream.h
index dfd6cbc2c..5da272ba8 100644
--- a/src/modules/video/VideoStream.h
+++ b/src/modules/video/VideoStream.h
@@ -34,6 +34,9 @@ namespace video
 class VideoStream : public Stream
 {
 public:
+
+	static love::Type type;
+
 	virtual ~VideoStream() {}
 
 	virtual int getWidth() const = 0;
diff --git a/src/modules/video/wrap_Video.cpp b/src/modules/video/wrap_Video.cpp
index b57dcb4f6..fcb2d0619 100644
--- a/src/modules/video/wrap_Video.cpp
+++ b/src/modules/video/wrap_Video.cpp
@@ -45,7 +45,7 @@ int w_newVideoStream(lua_State *L)
 		stream = instance()->newVideoStream(file);
 	});
 
-	luax_pushtype(L, VIDEO_VIDEO_STREAM_ID, stream);
+	luax_pushtype(L, VideoStream::type, stream);
 	stream->release();
 	return 1;
 }
@@ -75,7 +75,7 @@ extern "C" int luaopen_love_video(lua_State *L)
 	WrappedModule w;
 	w.module = instance;
 	w.name = "video";
-	w.type = MODULE_ID;
+	w.type = &Module::type;
 	w.functions = functions;
 	w.types = types;
 
diff --git a/src/modules/video/wrap_VideoStream.cpp b/src/modules/video/wrap_VideoStream.cpp
index 5cb0db7ff..74f6be9ce 100644
--- a/src/modules/video/wrap_VideoStream.cpp
+++ b/src/modules/video/wrap_VideoStream.cpp
@@ -27,23 +27,23 @@ namespace video
 
 VideoStream *luax_checkvideostream(lua_State *L, int idx)
 {
-	return luax_checktype<VideoStream>(L, idx, VIDEO_VIDEO_STREAM_ID);
+	return luax_checktype<VideoStream>(L, idx, VideoStream::type);
 }
 
 int w_VideoStream_setSync(lua_State *L)
 {
 	auto stream = luax_checkvideostream(L, 1);
 
-	if (luax_istype(L, 2, AUDIO_SOURCE_ID))
+	if (luax_istype(L, 2, love::audio::Source::type))
 	{
-		auto src = luax_totype<love::audio::Source>(L, 2, AUDIO_SOURCE_ID);
+		auto src = luax_totype<love::audio::Source>(L, 2, love::audio::Source::type);
 		auto sync = new VideoStream::SourceSync(src);
 		stream->setSync(sync);
 		sync->release();
 	}
-	else if (luax_istype(L, 2, VIDEO_VIDEO_STREAM_ID))
+	else if (luax_istype(L, 2, VideoStream::type))
 	{
-		auto other = luax_totype<VideoStream>(L, 2, VIDEO_VIDEO_STREAM_ID);
+		auto other = luax_totype<VideoStream>(L, 2, VideoStream::type);
 		stream->setSync(other->getSync());
 	}
 	else if (lua_isnoneornil(L, 2))
@@ -124,7 +124,7 @@ static const luaL_Reg videostream_functions[] =
 
 int luaopen_videostream(lua_State *L)
 {
-	return luax_register_type(L, VIDEO_VIDEO_STREAM_ID, "VideoStream", videostream_functions, nullptr);
+	return luax_register_type(L, VideoStream::type, "VideoStream", videostream_functions, nullptr);
 }
 
 } // video
diff --git a/src/modules/window/wrap_Window.cpp b/src/modules/window/wrap_Window.cpp
index f9a406eb4..8b4c00802 100644
--- a/src/modules/window/wrap_Window.cpp
+++ b/src/modules/window/wrap_Window.cpp
@@ -351,7 +351,7 @@ int w_getPosition(lua_State *L)
 
 int w_setIcon(lua_State *L)
 {
-	image::ImageData *i = luax_checktype<image::ImageData>(L, 1, IMAGE_IMAGE_DATA_ID);
+	image::ImageData *i = luax_checktype<image::ImageData>(L, 1, image::ImageData::type);
 	luax_pushboolean(L, instance()->setIcon(i));
 	return 1;
 }
@@ -359,7 +359,7 @@ int w_setIcon(lua_State *L)
 int w_getIcon(lua_State *L)
 {
 	image::ImageData *i = instance()->getIcon();
-	luax_pushtype(L, IMAGE_IMAGE_DATA_ID, i);
+	luax_pushtype(L, image::ImageData::type, i);
 	return 1;
 }
 
@@ -590,7 +590,7 @@ extern "C" int luaopen_love_window(lua_State *L)
 	WrappedModule w;
 	w.module = instance;
 	w.name = "window";
-	w.type = MODULE_ID;
+	w.type = &Module::type;
 	w.functions = functions;
 	w.types = 0;