Revert "move object id to column name"

This reverts commit 1d12717a55564fdf90f894c296411ca6b3363066.
Revert "fix for bug 2613"

This reverts commit c88de854afdc4caff5da9d998f0a458520d09b3c.