one/it

Is there a difference between:

1-I don’t have any tools but my neighbor does. So when I need one, I generally borrow it from him.
2-I don’t have any tools but my neighbor does. So when I need one, I generally borrow one from him.

I think “1” is better than “2” because when I need a tool, I need a specific one.
… when I need a tool, I borrow it from him. sounds fine
… when I need a toll, I borrow one from him. sounds as if any old tool he has will do.

I agree that #1 sounds more natural: 'when I need one, I borrow it (= that one) from him. The specificity resides in the first ‘one’.