Fix peer system grain lookup