Fix uuid vs id usage