Revert "Some object ID changes due to conflicts"

This reverts commit a362e247f50aecec4d9685bbf4ce473591f6700b.
Revert Wareya's collision system changes for now

This reverts commits 11183072709511b68ceede48538d73fd33be538b,
bb66c87a7c16f28b0efcb543d06dd19af163ea5a,
dac484a65449c115ab64491d535aa74d0390bc11,
438081c49b4b76f968c6d289049b32403a78e0ff