--- a/src/linetypes/modelobject.cpp	Fri Dec 28 00:03:47 2018 +0200
+++ b/src/linetypes/modelobject.cpp	Thu Jun 20 08:54:35 2019 +0300
@@ -33,15 +33,13 @@
 #include "empty.h"
 #include "circularprimitive.h"
 
-// List of all LDObjects
-QMap<qint32, LDObject*> g_allObjects;
-
-enum { MAX_LDOBJECT_IDS = (1 << 24) };
+static Uuid id_counter;
 
 // =============================================================================
 // LDObject constructors
 //
 LDObject::LDObject() :
+	id {++id_counter},
 	m_isHidden {false}
 {
 	m_randomColor = QColor::fromHsv (rand() % 360, rand() % 256, rand() % 96 + 128);