Fix hardcoded id column reference