Fixed generic module inclusion lookup. Use type_id instead of object_id for types.