diff --git a/src/resources/objects/creature/CreatureMessageBuilder.java b/src/resources/objects/creature/CreatureMessageBuilder.java
index 7420ea47..fb54bf99 100644
--- a/src/resources/objects/creature/CreatureMessageBuilder.java
+++ b/src/resources/objects/creature/CreatureMessageBuilder.java
@@ -1063,7 +1063,7 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
 		buffer.putInt(1);
 		buffer.putInt(creature.getEquipmentListUpdateCounter());
 		buffer.put((byte) 1);
-		buffer.putShort((short) creature.getEquipmentList().indexOf(item));
+		buffer.putShort((short) creature.getEquipmentList().indexOf(item.getObjectId()));
 		if(item.getCustomization() == null || item.getCustomization().length == 0) {
 			buffer.putShort((short) 0);
 		} else {
@@ -1099,7 +1099,7 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
 		buffer.putInt(1);
 		buffer.putInt(creature.getEquipmentListUpdateCounter());
 		buffer.put((byte) 0);
-		buffer.putShort((short) creature.getEquipmentList().indexOf(item));
+		buffer.putShort((short) creature.getEquipmentList().indexOf(item.getObjectId()));
 		
 		int size = buffer.position();
 		buffer.flip();
diff --git a/src/services/EquipmentService.java b/src/services/EquipmentService.java
index 917a37b5..3f2b5a20 100644
--- a/src/services/EquipmentService.java
+++ b/src/services/EquipmentService.java
@@ -144,7 +144,7 @@ public class EquipmentService implements INetworkDispatch {
 		
 		// TODO: bio-link (assign it by objectID with setAttachment and then just display the customName for that objectID).
 		
-		if(!actor.getEquipmentList().contains(item)) 
+		if(!actor.getEquipmentList().contains(item.getObjectId())) 
 		{
 			actor.addObjectToEquipList(item);
 			processItemAtrributes(actor, item, true);
@@ -160,7 +160,7 @@ public class EquipmentService implements INetworkDispatch {
 		if(func != null) func.__call__(Py.java2py(core), Py.java2py(actor), Py.java2py(item));
 
 		
-		if(actor.getEquipmentList().contains(item)) 
+		if(actor.getEquipmentList().contains(item.getObjectId())) 
 		{
 			actor.removeObjectFromEquipList(item);
 			processItemAtrributes(actor, item, false);
diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java
index b1dff6dc..d137f913 100644
--- a/src/services/PlayerService.java
+++ b/src/services/PlayerService.java
@@ -1213,7 +1213,7 @@ public class PlayerService implements INetworkDispatch {
 					// need to set a unity attachment.
 					ringList.get(0).setAttachment("unity", (Boolean) true);
 
-					if(!acceptor.getEquipmentList().contains(ringList.get(0)))
+					if(!acceptor.getEquipmentList().contains(ringList.get(0).getObjectId()))
 						core.equipmentService.equip(acceptor, ringList.get(0));
 
 					aGhost.setSpouseName(proposer.getCustomName());
@@ -1248,7 +1248,7 @@ public class PlayerService implements INetworkDispatch {
 				SWGObject selectedRing = core.objectService.getObject(ringWindow.getObjectIdByIndex(index));
 				selectedRing.setAttachment("unity", (Boolean) true);
 
-				if(!actor.getEquipmentList().contains(selectedRing))
+				if(!actor.getEquipmentList().contains(selectedRing.getObjectId()))
 					core.equipmentService.equip(actor, selectedRing);
 
 				PlayerObject aGhost = (PlayerObject) actor.getSlottedObject("ghost");